[ISSUE-455] Fix noImmediatePrefix broken issue

nosir · Jul 15, 2019 · 996f977 · 996f977
1 parent 98106d5
commit 996f977
Show file tree

Hide file tree

Showing 17 changed files with 91 additions and 54 deletions.
diff --git a/bower.json b/bower.json
@@ -3,7 +3,7 @@
   "description":
     "JavaScript library for formatting input text content when you are typing",
   "keywords": ["cleave", "javascript", "html", "form", "input"],
-  "version": "1.5.2",
+  "version": "1.5.3",
   "author": {
     "name": "Max Huang",
     "email": "[email protected]",

diff --git a/dist/cleave-angular.js b/dist/cleave-angular.js
@@ -332,8 +332,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	        value = Util.stripDelimiters(value, pps.delimiter, pps.delimiters);
 
 	        // strip prefix
-	        // var strippedPreviousResult = Util.stripDelimiters(pps.result, pps.delimiter, pps.delimiters);
-	        value = Util.getPrefixStrippedValue(value, pps.prefix, pps.prefixLength, pps.result, pps.delimiter, pps.delimiters);
+	        value = Util.getPrefixStrippedValue(
+	            value, pps.prefix, pps.prefixLength,
+	            pps.result, pps.delimiter, pps.delimiters, pps.noImmediatePrefix
+	        );
 
 	        // strip non-numeric characters
 	        value = pps.numericOnly ? Util.strip(value, /[^\d]/g) : value;
@@ -342,7 +344,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        value = pps.uppercase ? value.toUpperCase() : value;
 	        value = pps.lowercase ? value.toLowerCase() : value;
 
-	        // prefix
+	        // prevent from showing prefix when no immediate option enabled with empty input value
 	        if (pps.prefix && (!pps.noImmediatePrefix || value.length)) {
 	            value = pps.prefix + value;
 
@@ -1405,15 +1407,17 @@ return /******/ (function(modules) { // webpackBootstrap
 	    // PREFIX-123   |   PEFIX-123     |     123
 	    // PREFIX-123   |   PREFIX-23     |     23
 	    // PREFIX-123   |   PREFIX-1234   |     1234
-	    getPrefixStrippedValue: function (value, prefix, prefixLength, prevResult, delimiter, delimiters) {
+	    getPrefixStrippedValue: function (value, prefix, prefixLength, prevResult, delimiter, delimiters, noImmediatePrefix) {
 	        // No prefix
 	        if (prefixLength === 0) {
 	          return value;
 	        }
 
-	        // Pre result has issue
-	        // Revert to raw prefix
+	        // Pre result prefix string does not match pre-defined prefix
 	        if (prevResult.slice(0, prefixLength) !== prefix) {
+	          // Check if the first time user entered something
+	          if (noImmediatePrefix && !prevResult && value) return value;
+
 	          return '';
 	        }
 

diff --git a/dist/cleave-angular.min.js b/dist/cleave-angular.min.js
diff --git a/dist/cleave-esm.js b/dist/cleave-esm.js
@@ -775,15 +775,17 @@ var Util = {
     // PREFIX-123   |   PEFIX-123     |     123
     // PREFIX-123   |   PREFIX-23     |     23
     // PREFIX-123   |   PREFIX-1234   |     1234
-    getPrefixStrippedValue: function (value, prefix, prefixLength, prevResult, delimiter, delimiters) {
+    getPrefixStrippedValue: function (value, prefix, prefixLength, prevResult, delimiter, delimiters, noImmediatePrefix) {
         // No prefix
         if (prefixLength === 0) {
           return value;
         }
 
-        // Pre result has issue
-        // Revert to raw prefix
+        // Pre result prefix string does not match pre-defined prefix
         if (prevResult.slice(0, prefixLength) !== prefix) {
+          // Check if the first time user entered something
+          if (noImmediatePrefix && !prevResult && value) return value;
+
           return '';
         }
 
@@ -1306,8 +1308,10 @@ Cleave.prototype = {
         value = Util.stripDelimiters(value, pps.delimiter, pps.delimiters);
 
         // strip prefix
-        // var strippedPreviousResult = Util.stripDelimiters(pps.result, pps.delimiter, pps.delimiters);
-        value = Util.getPrefixStrippedValue(value, pps.prefix, pps.prefixLength, pps.result, pps.delimiter, pps.delimiters);
+        value = Util.getPrefixStrippedValue(
+            value, pps.prefix, pps.prefixLength,
+            pps.result, pps.delimiter, pps.delimiters, pps.noImmediatePrefix
+        );
 
         // strip non-numeric characters
         value = pps.numericOnly ? Util.strip(value, /[^\d]/g) : value;
@@ -1316,7 +1320,7 @@ Cleave.prototype = {
         value = pps.uppercase ? value.toUpperCase() : value;
         value = pps.lowercase ? value.toLowerCase() : value;
 
-        // prefix
+        // prevent from showing prefix when no immediate option enabled with empty input value
         if (pps.prefix && (!pps.noImmediatePrefix || value.length)) {
             value = pps.prefix + value;
 

diff --git a/dist/cleave-esm.min.js b/dist/cleave-esm.min.js
diff --git a/dist/cleave-react-node.js b/dist/cleave-react-node.js
@@ -413,7 +413,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        value = Util.stripDelimiters(value, pps.delimiter, pps.delimiters);
 
 	        // strip prefix
-	        value = Util.getPrefixStrippedValue(value, pps.prefix, pps.prefixLength, pps.result, pps.delimiter, pps.delimiters);
+	        value = Util.getPrefixStrippedValue(value, pps.prefix, pps.prefixLength, pps.result, pps.delimiter, pps.delimiters, pps.noImmediatePrefix);
 
 	        // strip non-numeric characters
 	        value = pps.numericOnly ? Util.strip(value, /[^\d]/g) : value;
@@ -422,7 +422,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        value = pps.uppercase ? value.toUpperCase() : value;
 	        value = pps.lowercase ? value.toLowerCase() : value;
 
-	        // prefix
+	        // prevent from showing prefix when no immediate option enabled with empty input value
 	        if (pps.prefix && (!pps.noImmediatePrefix || value.length)) {
 	            value = pps.prefix + value;
 
@@ -2601,15 +2601,17 @@ return /******/ (function(modules) { // webpackBootstrap
 	    // PREFIX-123   |   PEFIX-123     |     123
 	    // PREFIX-123   |   PREFIX-23     |     23
 	    // PREFIX-123   |   PREFIX-1234   |     1234
-	    getPrefixStrippedValue: function getPrefixStrippedValue(value, prefix, prefixLength, prevResult, delimiter, delimiters) {
+	    getPrefixStrippedValue: function getPrefixStrippedValue(value, prefix, prefixLength, prevResult, delimiter, delimiters, noImmediatePrefix) {
 	        // No prefix
 	        if (prefixLength === 0) {
 	            return value;
 	        }
 
-	        // Pre result has issue
-	        // Revert to raw prefix
+	        // Pre result prefix string does not match pre-defined prefix
 	        if (prevResult.slice(0, prefixLength) !== prefix) {
+	            // Check if the first time user entered something
+	            if (noImmediatePrefix && !prevResult && value) return value;
+
 	            return '';
 	        }
 

diff --git a/dist/cleave-react-node.min.js b/dist/cleave-react-node.min.js
diff --git a/dist/cleave-react.js b/dist/cleave-react.js
@@ -413,7 +413,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        value = Util.stripDelimiters(value, pps.delimiter, pps.delimiters);
 
 	        // strip prefix
-	        value = Util.getPrefixStrippedValue(value, pps.prefix, pps.prefixLength, pps.result, pps.delimiter, pps.delimiters);
+	        value = Util.getPrefixStrippedValue(value, pps.prefix, pps.prefixLength, pps.result, pps.delimiter, pps.delimiters, pps.noImmediatePrefix);
 
 	        // strip non-numeric characters
 	        value = pps.numericOnly ? Util.strip(value, /[^\d]/g) : value;
@@ -422,7 +422,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        value = pps.uppercase ? value.toUpperCase() : value;
 	        value = pps.lowercase ? value.toLowerCase() : value;
 
-	        // prefix
+	        // prevent from showing prefix when no immediate option enabled with empty input value
 	        if (pps.prefix && (!pps.noImmediatePrefix || value.length)) {
 	            value = pps.prefix + value;
 
@@ -2795,15 +2795,17 @@ return /******/ (function(modules) { // webpackBootstrap
 	    // PREFIX-123   |   PEFIX-123     |     123
 	    // PREFIX-123   |   PREFIX-23     |     23
 	    // PREFIX-123   |   PREFIX-1234   |     1234
-	    getPrefixStrippedValue: function getPrefixStrippedValue(value, prefix, prefixLength, prevResult, delimiter, delimiters) {
+	    getPrefixStrippedValue: function getPrefixStrippedValue(value, prefix, prefixLength, prevResult, delimiter, delimiters, noImmediatePrefix) {
 	        // No prefix
 	        if (prefixLength === 0) {
 	            return value;
 	        }
 
-	        // Pre result has issue
-	        // Revert to raw prefix
+	        // Pre result prefix string does not match pre-defined prefix
 	        if (prevResult.slice(0, prefixLength) !== prefix) {
+	            // Check if the first time user entered something
+	            if (noImmediatePrefix && !prevResult && value) return value;
+
 	            return '';
 	        }
 

diff --git a/dist/cleave-react.min.js b/dist/cleave-react.min.js
diff --git a/dist/cleave.js b/dist/cleave.js
@@ -332,8 +332,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	        value = Util.stripDelimiters(value, pps.delimiter, pps.delimiters);
 
 	        // strip prefix
-	        // var strippedPreviousResult = Util.stripDelimiters(pps.result, pps.delimiter, pps.delimiters);
-	        value = Util.getPrefixStrippedValue(value, pps.prefix, pps.prefixLength, pps.result, pps.delimiter, pps.delimiters);
+	        value = Util.getPrefixStrippedValue(
+	            value, pps.prefix, pps.prefixLength,
+	            pps.result, pps.delimiter, pps.delimiters, pps.noImmediatePrefix
+	        );
 
 	        // strip non-numeric characters
 	        value = pps.numericOnly ? Util.strip(value, /[^\d]/g) : value;
@@ -342,7 +344,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        value = pps.uppercase ? value.toUpperCase() : value;
 	        value = pps.lowercase ? value.toLowerCase() : value;
 
-	        // prefix
+	        // prevent from showing prefix when no immediate option enabled with empty input value
 	        if (pps.prefix && (!pps.noImmediatePrefix || value.length)) {
 	            value = pps.prefix + value;
 
@@ -1348,15 +1350,17 @@ return /******/ (function(modules) { // webpackBootstrap
 	    // PREFIX-123   |   PEFIX-123     |     123
 	    // PREFIX-123   |   PREFIX-23     |     23
 	    // PREFIX-123   |   PREFIX-1234   |     1234
-	    getPrefixStrippedValue: function (value, prefix, prefixLength, prevResult, delimiter, delimiters) {
+	    getPrefixStrippedValue: function (value, prefix, prefixLength, prevResult, delimiter, delimiters, noImmediatePrefix) {
 	        // No prefix
 	        if (prefixLength === 0) {
 	          return value;
 	        }
 
-	        // Pre result has issue
-	        // Revert to raw prefix
+	        // Pre result prefix string does not match pre-defined prefix
 	        if (prevResult.slice(0, prefixLength) !== prefix) {
+	          // Check if the first time user entered something
+	          if (noImmediatePrefix && !prevResult && value) return value;
+
 	          return '';
 	        }
 

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": "1.5.2",
+  "version": "1.5.3",
   "files": [
     "src",
     "dist",

diff --git a/src/Cleave.js b/src/Cleave.js
@@ -276,8 +276,10 @@ Cleave.prototype = {
         value = Util.stripDelimiters(value, pps.delimiter, pps.delimiters);
 
         // strip prefix
-        // var strippedPreviousResult = Util.stripDelimiters(pps.result, pps.delimiter, pps.delimiters);
-        value = Util.getPrefixStrippedValue(value, pps.prefix, pps.prefixLength, pps.result, pps.delimiter, pps.delimiters);
+        value = Util.getPrefixStrippedValue(
+            value, pps.prefix, pps.prefixLength,
+            pps.result, pps.delimiter, pps.delimiters, pps.noImmediatePrefix
+        );
 
         // strip non-numeric characters
         value = pps.numericOnly ? Util.strip(value, /[^\d]/g) : value;
@@ -286,7 +288,7 @@ Cleave.prototype = {
         value = pps.uppercase ? value.toUpperCase() : value;
         value = pps.lowercase ? value.toLowerCase() : value;
 
-        // prefix
+        // prevent from showing prefix when no immediate option enabled with empty input value
         if (pps.prefix && (!pps.noImmediatePrefix || value.length)) {
             value = pps.prefix + value;
 

diff --git a/src/Cleave.react.js b/src/Cleave.react.js
@@ -350,7 +350,10 @@ var cleaveReactClass = CreateReactClass({
         value = Util.stripDelimiters(value, pps.delimiter, pps.delimiters);
 
         // strip prefix
-        value = Util.getPrefixStrippedValue(value, pps.prefix, pps.prefixLength, pps.result, pps.delimiter, pps.delimiters);
+        value = Util.getPrefixStrippedValue(
+            value, pps.prefix, pps.prefixLength,
+            pps.result, pps.delimiter, pps.delimiters, pps.noImmediatePrefix
+        );
 
         // strip non-numeric characters
         value = pps.numericOnly ? Util.strip(value, /[^\d]/g) : value;
@@ -359,7 +362,7 @@ var cleaveReactClass = CreateReactClass({
         value = pps.uppercase ? value.toUpperCase() : value;
         value = pps.lowercase ? value.toLowerCase() : value;
 
-        // prefix
+        // prevent from showing prefix when no immediate option enabled with empty input value
         if (pps.prefix && (!pps.noImmediatePrefix || value.length)) {
             value = pps.prefix + value;
 

diff --git a/src/utils/Util.js b/src/utils/Util.js
@@ -85,15 +85,17 @@ var Util = {
     // PREFIX-123   |   PEFIX-123     |     123
     // PREFIX-123   |   PREFIX-23     |     23
     // PREFIX-123   |   PREFIX-1234   |     1234
-    getPrefixStrippedValue: function (value, prefix, prefixLength, prevResult, delimiter, delimiters) {
+    getPrefixStrippedValue: function (value, prefix, prefixLength, prevResult, delimiter, delimiters, noImmediatePrefix) {
         // No prefix
         if (prefixLength === 0) {
           return value;
         }
 
-        // Pre result has issue
-        // Revert to raw prefix
+        // Pre result prefix string does not match pre-defined prefix
         if (prevResult.slice(0, prefixLength) !== prefix) {
+          // Check if the first time user entered something
+          if (noImmediatePrefix && !prevResult && value) return value;
+
           return '';
         }
 

diff --git a/test/fixtures/util.json b/test/fixtures/util.json
@@ -126,20 +126,34 @@
         4,
         "test12",
         "-",
-        []
+        [],
+        false
       ],
       "expected": "123"
     },
     {
       "params": [
-        "test23",
+        "1",
         "test",
         4,
-        "test123",
+        "",
         "-",
-        []
+        [],
+        false
+      ],
+      "expected": ""
+    },
+    {
+      "params": [
+        "1",
+        "test",
+        4,
+        "",
+        "-",
+        [],
+        true
       ],
-      "expected": "23"
+      "expected": "1"
     },
     {
       "params": [

diff --git a/test/unit/Util_spec.js b/test/unit/Util_spec.js
@@ -25,7 +25,7 @@ describe('Util', function () {
         _.each(json.getPrefixStrippedValue, function (data) {
             var params = data.params;
             it('should get prefix stripped value for: ' + params[0] + ' as: ' + data.expected, function () {
-                Util.getPrefixStrippedValue(params[0], params[1], params[2], params[3], params[4], params[5]).should.eql(data.expected);
+                Util.getPrefixStrippedValue(params[0], params[1], params[2], params[3], params[4], params[5], params[6]).should.eql(data.expected);
             });
         });
     });