@jsuites/utils 6.0.0 → 6.0.2

package/dist/index.js

@@ -275,7 +275,7 @@
         return component;
     })();
 
-    function Mask() {
+    const Mask = (function() {
         // Currency
         const tokens = {
             // Escape
@@ -1534,7 +1534,7 @@
                     }
                 }
             },
-            'HH24': function(v, two) {
+            'HH24': function(v, two = true) {
                 let test = false;
 
                 let number = parseInt(v)
@@ -1542,7 +1542,7 @@
                 if (number >= 0 && number < 10) {
                     if (isBlank(this.values[this.index])) {
                         if (number > 2 && number < 10) {
-                            if (two) {
+                            if (two !== false) {
                                 v = 0 + v;
                             }
                             this.date[3] = this.values[this.index] = v;
@@ -1552,13 +1552,13 @@
                         }
                     } else {
                         if (this.values[this.index] == 2 && number < 4) {
-                            if (! two && this.values[this.index] === '0') {
+                            if (two === false && this.values[this.index] === '0') {
                                 this.values[this.index] = '';
                             }
                             this.date[3] = this.values[this.index] += v;
                             this.index++;
                         } else if (this.values[this.index] < 2 && number < 10) {
-                            if (! two && this.values[this.index] === '0') {
+                            if (two === false && this.values[this.index] === '0') {
                                 this.values[this.index] = '';
                             }
                             this.date[3] = this.values[this.index] += v;
@@ -1575,6 +1575,10 @@
                 if (test === true) {
                     var t = parseInt(this.values[this.index]);
                     if (t >= 0 && t < 24) {
+                        // Pad single digit with leading zero for HH24 format
+                        if (two !== false && this.values[this.index] && this.values[this.index].length === 1) {
+                            this.values[this.index] = '0' + this.values[this.index];
+                        }
                         this.date[3] = this.values[this.index];
                         this.index++;
                         return false;
@@ -1582,10 +1586,10 @@
                 }
             },
             'HH': function(v) {
-                parseMethods['HH24'].call(this, v, 1);
+                parseMethods['HH24'].call(this, v, true);
             },
             'H': function(v) {
-                parseMethods['HH24'].call(this, v, 0);
+                parseMethods['HH24'].call(this, v, false);
             },
             '\\[H\\]': function(v) {
                 if (this.values[this.index] == undefined) {
@@ -2579,7 +2583,33 @@
         }
 
         const format = function(str, config) {
-            let ret = new Intl.NumberFormat(config.locale, config.options || {}).format(str);
+            // Extract numeric value from formatted or unformatted string (e.g., "₹3.00" -> 3)
+            // Using same logic as ParseValue to handle already-formatted strings
+            let numericValue;
+            const decimal = config.decimal || '.';
+            let v = String(str).split(decimal);
+
+            // Detect negative sign
+            let signal = v[0].includes('-');
+
+            // Extract digits only
+            v[0] = v[0].match(/[0-9]+/g);
+            if (v[0]) {
+                if (signal) v[0].unshift('-');
+                v[0] = v[0].join('');
+            } else {
+                v[0] = signal ? '-0' : '0';
+            }
+
+            if (v[1] !== undefined) {
+                v[1] = v[1].match(/[0-9]+/g);
+                v[1] = v[1] ? v[1].join('') : '';
+            }
+
+            // Convert to number
+            numericValue = v[0] || v[1] ? parseFloat(v.join('.')) : 0;
+
+            let ret = new Intl.NumberFormat(config.locale, config.options || {}).format(numericValue);
 
             config.values.push(ret);
         }
@@ -3965,7 +3995,7 @@
             let value = element[property];
             // Get the mask
             if (! mask) {
-                mask = element.getAttribute('data-mask');
+                mask = element.getAttribute('data-mask') || element.mask;
             }
             // Keep the current caret position
             let caret = getCaret(element);
@@ -3973,8 +4003,16 @@
                 value = value.substring(0, caret) + hiddenCaret + value.substring(caret);
             }
 
+            if (typeof mask === 'string') {
+                mask = { mask: mask };
+            }
+
+            if (mask.locale) {
+                return;
+            }
+
             // Run mask
-            let result = Component(value, { mask: mask }, true);
+            let result = Component(value, mask, true);
 
             // New value
             let newValue = result.values.join('');
@@ -4006,7 +4044,7 @@
         Component.adjustPrecision = adjustPrecision;
 
         return Component;
-    }
+    })();
 
     return { Mask: Mask, Helpers: Helpers };
 })));

package/package.json

@@ -19,7 +19,7 @@
         "javascript utilities"
     ],
     "main": "dist/index.js",
-    "version": "6.0.0",
+    "version": "6.0.2",
     "bugs": "https://github.com/jsuites/jsuites/issues",
     "homepage": "https://github.com/jsuites/jsuites",
     "docs": "https://jsuites.net/",