jsuites 6.1.1 → 6.1.3

package/dist/jsuites.js

@@ -298,7 +298,7 @@ var jSuites;
             // Number
             fraction: [ '#{0,1}.*?\\?+\\/[0-9?]+' ],
             // Currency tokens
-            currency: [ '#(.{1})##0?(.{1}0+)?( ?;(.*)?)?' ],
+            currency: [ '#(.{1})##0?(.{1}[0#]+)?( ?;(.*)?)?' ],
             // Scientific
             scientific: [ '[0#]+([.,]{1}0*#*)?E{1}\\+0+' ],
             // Percentage
@@ -1749,7 +1749,7 @@ var jSuites;
                     this.values[this.index] = '';
                 }
             },
-            '#(.{1})##0?(.{1}0+)?( ?;(.*)?)?': function(v) {
+            '#(.{1})##0?(.{1}[0#]+)?( ?;(.*)?)?': function(v) {
                 // Process first the number
                 parseMethods['[0#]+([.,]{1}0*#*)?'].call(this, v, true);
                 // Create the separators
@@ -2382,77 +2382,89 @@ var jSuites;
         const adjustNumberOfDecimalPlaces = function(config, value) {
             let temp = value;
             let mask = config.mask;
-            let expo;
 
             if (config.type === 'scientific') {
+                // Scientific notation handling
                 mask = config.mask.toUpperCase().split('E')[0];
 
                 let numOfDecimalPlaces = mask.split(config.decimal);
-                numOfDecimalPlaces = numOfDecimalPlaces[1].match(/[0#]+/g);
-                numOfDecimalPlaces = numOfDecimalPlaces[0]?.length ?? 0;
-                temp = temp.toExponential(numOfDecimalPlaces);
-                expo = temp.toString().split('e+');
-                temp = Number(expo[0]);
-            }
-
-            if (mask.indexOf(config.decimal) === -1) {
-                // No decimal places
-                if (! Number.isInteger(temp)) {
-                    temp = temp.toFixed(0);
-                }
-            } else {
-                // Length of the decimal
-                let mandatoryDecimalPlaces = mask.split(config.decimal);
-                mandatoryDecimalPlaces = mandatoryDecimalPlaces[1].match(/0+/g);
-                if (mandatoryDecimalPlaces) {
-                    mandatoryDecimalPlaces = mandatoryDecimalPlaces[0].length;
-                } else {
-                    mandatoryDecimalPlaces = 0;
-                }
-                // Amount of decimal
-                let numOfDecimalPlaces = temp.toString().split(config.decimal)
-                numOfDecimalPlaces = numOfDecimalPlaces[1]?.length ?? 0;
-                // Necessary adjustment
-                let necessaryAdjustment = 0;
-                if (numOfDecimalPlaces < mandatoryDecimalPlaces) {
-                    necessaryAdjustment = mandatoryDecimalPlaces;
+                // Handle masks without decimal (e.g., '0E+00')
+                if (numOfDecimalPlaces[1]) {
+                    numOfDecimalPlaces = numOfDecimalPlaces[1].match(/[0#]+/g);
+                    numOfDecimalPlaces = numOfDecimalPlaces[0]?.length ?? 0;
                 } else {
-                    // Optional
-                    let optionalDecimalPlaces = mask.split(config.decimal);
-                    optionalDecimalPlaces = optionalDecimalPlaces[1].match(/[0#]+/g);
-                    if (optionalDecimalPlaces) {
-                        optionalDecimalPlaces = optionalDecimalPlaces[0].length;
-                        if (numOfDecimalPlaces > optionalDecimalPlaces) {
-                            necessaryAdjustment = optionalDecimalPlaces;
-                        }
-                    }
+                    numOfDecimalPlaces = 0;
                 }
-                // Adjust decimal numbers if applicable
-                if (necessaryAdjustment) {
-                    let t = temp.toFixed(necessaryAdjustment);
-                    let n = temp.toString().split('.');
-                    let fraction = n[1];
-                    if (fraction && fraction.length > necessaryAdjustment && fraction[fraction.length - 1] === '5') {
-                        t = parseFloat(n[0] + '.' + fraction + '1').toFixed(necessaryAdjustment);
-                    }
-                    temp = t;
-                }
-            }
+                temp = temp.toExponential(numOfDecimalPlaces);
+                // Split by 'e' to handle both positive (e+) and negative (e-) exponents
+                let expo = temp.toString().split('e');
+                // Keep coefficient as string to preserve decimal places (e.g., '1.00' not 1)
+                temp = expo[0];
 
-            if (config.type === 'scientific') {
+                // Process padding zeros for coefficient
                 let ret = processPaddingZeros(mask, temp, config.decimal);
                 if (ret) {
                     temp = ret;
                 }
                 expo[0] = temp;
 
-                mask = config.mask.toUpperCase().split('E+')[1];
-                ret = processPaddingZeros(mask, expo[1], config.decimal);
+                // Handle both E+ and E- in mask for exponent
+                mask = config.mask.toUpperCase().split(/E[+-]?/)[1];
+                ret = processPaddingZeros(mask, expo[1]?.replace(/^[+-]/, ''), config.decimal);
                 if (ret) {
-                    expo[1] = ret;
+                    // Preserve the sign from the original exponent
+                    let sign = expo[1]?.charAt(0);
+                    expo[1] = (sign === '-' ? '-' : '+') + ret;
                 }
 
-                temp = expo.join('e+');
+                temp = expo.join('e');
+            } else {
+                // Non-scientific decimal adjustment
+                if (mask.indexOf(config.decimal) === -1) {
+                    // No decimal places
+                    if (! Number.isInteger(temp)) {
+                        temp = temp.toFixed(0);
+                    }
+                } else {
+                    // Length of the decimal
+                    let mandatoryDecimalPlaces = mask.split(config.decimal);
+                    mandatoryDecimalPlaces = mandatoryDecimalPlaces[1].match(/0+/g);
+                    if (mandatoryDecimalPlaces) {
+                        mandatoryDecimalPlaces = mandatoryDecimalPlaces[0].length;
+                    } else {
+                        mandatoryDecimalPlaces = 0;
+                    }
+
+                    // Amount of decimal (use original value to check decimal separator)
+                    let valueStr = value.toString();
+                    let numOfDecimalPlaces = valueStr.split(valueStr.includes('.') ? '.' : (config.decimal || '.'))
+                    numOfDecimalPlaces = numOfDecimalPlaces[1]?.length ?? 0;
+                    // Necessary adjustment
+                    let necessaryAdjustment = 0;
+                    if (numOfDecimalPlaces < mandatoryDecimalPlaces) {
+                        necessaryAdjustment = mandatoryDecimalPlaces;
+                    } else {
+                        // Optional
+                        let optionalDecimalPlaces = mask.split(config.decimal);
+                        optionalDecimalPlaces = optionalDecimalPlaces[1].match(/[0#]+/g);
+                        if (optionalDecimalPlaces) {
+                            optionalDecimalPlaces = optionalDecimalPlaces[0].length;
+                            if (numOfDecimalPlaces > optionalDecimalPlaces) {
+                                necessaryAdjustment = optionalDecimalPlaces;
+                            }
+                        }
+                    }
+                    // Adjust decimal numbers if applicable
+                    if (necessaryAdjustment) {
+                        let t = temp.toFixed(necessaryAdjustment);
+                        let n = temp.toString().split('.');
+                        let fraction = n[1];
+                        if (fraction && fraction.length > necessaryAdjustment && fraction[fraction.length - 1] === '5') {
+                            t = parseFloat(n[0] + '.' + fraction + '1').toFixed(necessaryAdjustment);
+                        }
+                        temp = t;
+                    }
+                }
             }
 
             return temp;
@@ -3598,12 +3610,15 @@ var jSuites;
             return value;
         };
 
-        Component.render = function(value, options, fullMask) {
+        Component.render = function(value, options, fullMask, strict) {
             // Nothing to render
             if (value === '' || value === undefined || value === null) {
                 return '';
             }
 
+            // Store original value for strict mode
+            const originalValue = value;
+
             // Config
             const config = getConfig(options, value);
 
@@ -3624,6 +3639,11 @@ var jSuites;
                         value = value.toString();
                     }
                 } else {
+                    // Strict mode: for numeric masks, if string input is not a valid number,
+                    // return original value unchanged (Excel-like behavior)
+                    if (strict && typeof(originalValue) === 'string' && !isNumber(originalValue)) {
+                        return originalValue;
+                    }
                     if (config.type === 'percentage') {
                         if (typeof (value) === 'string' && value.indexOf('%') !== -1) {
                             value = value.replace('%', '');
@@ -5965,6 +5985,20 @@ if (! Modal && "function" === 'function') {
             return self.modals[0].modal.closed === true;
         }
 
+        self.openAt = function(a, b) {
+            let x, y;
+            if (a instanceof Event || (a && a.clientX !== undefined)) {
+                // openAt(event)
+                x = a.clientX;
+                y = a.clientY;
+            } else {
+                // openAt(x, y)
+                x = a;
+                y = b;
+            }
+            self.open(self.options, x, y, true);
+        };
+
         self.open = function(options, x, y, adjust) {
             // Get the main modal
             let menu = self.modals[0];
@@ -6913,7 +6947,7 @@ if (!Modal && "function" === 'function') {
             if (! self.isClosed() && self.autocomplete) {
 
                 // Remote or normal search
-                if (self.remote === true) {
+                if (self.remote === true && self.url) {
                     // Clear existing timeout
                     if (searchTimeout) {
                         clearTimeout(searchTimeout);
@@ -7345,8 +7379,35 @@ if (!Modal && "function" === 'function') {
             if (prop === 'value') {
                 setValue(self.value);
             } else if (prop === 'data') {
+                // Store current value before resetting data
+                let currentValue = self.value;
                 setData();
-                self.value = null;
+
+                // Only reset value if it's not in the new data
+                if (currentValue !== null && currentValue !== undefined && currentValue !== '') {
+                    let valuesToCheck = Array.isArray(currentValue) ? currentValue : [currentValue];
+
+                    // Filter to keep only values that exist in the new data
+                    let validValues = valuesToCheck.filter(v => {
+                        return self.data.some(item => {
+                            if (v === '' || item.value === '') {
+                                return v === item.value;
+                            }
+                            return v == item.value;
+                        });
+                    });
+
+                    if (validValues.length === 0) {
+                        // No valid values remain, reset to null
+                        self.value = null;
+                    } else if (self.multiple) {
+                        // Multi-select: keep only valid values
+                        self.value = validValues;
+                    } else {
+                        // Single select: re-apply the value
+                        self.value = validValues[0];
+                    }
+                }
             }
 
             if (typeof (lazyloading) === 'function') {
@@ -14841,7 +14902,9 @@ function Tabs(el, options) {
         }
 
         // Update controls
-        updateControls(0);
+        setTimeout(() => {
+            updateControls(0);
+        })
 
         if (obj.options.allowChangePosition == true) {
             Sorting(obj.headers, {
@@ -23022,7 +23085,7 @@ var jSuites = {
     ...dictionary,
     ...helpers,
     /** Current version */
-    version: '6.1.1',
+    version: '6.1.2',
     /** Bind new extensions to Jsuites */
     setExtensions: function(o) {
         if (typeof(o) == 'object') {

package/package.json

@@ -26,18 +26,18 @@
     },
     "main": "dist/jsuites.js",
     "types": "dist/jsuites.d.ts",
-    "version": "6.1.1",
+    "version": "6.1.3",
     "bugs": "https://github.com/jsuites/jsuites/issues",
     "homepage": "https://github.com/jsuites/jsuites",
     "docs": "https://jsuites.net",
     "download": "https://github.com/jsuites/jsuites/archive/master.zip",
     "dependencies": {
-        "@jsuites/utils": "^6.0.3",
+        "@jsuites/utils": "^6.0.4",
         "@lemonadejs/calendar": "^5.8.3",
         "@lemonadejs/color": "^5.8.0",
-        "@lemonadejs/contextmenu": "^5.8.0",
-        "@lemonadejs/dropdown": "^5.8.1",
-        "@lemonadejs/modal": "^5.8.1",
+        "@lemonadejs/contextmenu": "^5.8.1",
+        "@lemonadejs/dropdown": "^5.8.2",
+        "@lemonadejs/modal": "^5.8.2",
         "@lemonadejs/rating": "^5.8.1",
         "@lemonadejs/switch": "^5.8.0",
         "@lemonadejs/tabs": "^5.8.0",