jsuites 6.1.2 → 6.2.0

package/dist/jsuites.css

@@ -3977,7 +3977,8 @@ body.lm-dark-mode {
 }
 
 .lm-menu-submenu > div.lm-menu-item:hover,
-.lm-menu-submenu > div.lm-menu-item[data-cursor="true"] {
+.lm-menu-submenu > div.lm-menu-item[data-cursor="true"],
+.lm-menu-submenu > div.lm-menu-item[aria-expanded="true"] {
     background-color: var(--lm-background-color-highlight, #ebebeb);
 }
 
@@ -4007,7 +4008,8 @@ body.lm-dark-mode {
 }
 
 .lm-dark-mode .lm-menu-submenu > div.lm-menu-item:hover,
-.lm-dark-mode .lm-menu-submenu > div.lm-menu-item[data-cursor="true"] {
+.lm-dark-mode .lm-menu-submenu > div.lm-menu-item[data-cursor="true"],
+.lm-dark-mode .lm-menu-submenu > div.lm-menu-item[aria-expanded="true"] {
     background-color: var(--lm-background-color-highlight, #2d2d2d);
 }
 

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;
-                        }
-                    }
-                }
-                // 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;
+                    numOfDecimalPlaces = 0;
                 }
-            }
+                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('%', '');
@@ -5714,7 +5734,7 @@ if (! Modal && "function" === 'function') {
         // Initialize expanded state
         self.expanded = false;
 
-        if (self.type === 'line') {
+        if (self.type === 'line' || self.type === 'divisor') {
             return `<hr role="separator" />`;
         } else if (self.type === 'inline') {
             return `<div></div>`;
@@ -5789,9 +5809,69 @@ if (! Modal && "function" === 'function') {
                 let rect = parent.modal.el.getBoundingClientRect();
                 // Update modal
                 current.modal.open();
-                // Aria indication
-                current.modal.top = rect.y + s.el.offsetTop + 2;
-                current.modal.left = rect.x + 248;
+
+                // Calculate initial position using item's actual screen position (accounts for scroll)
+                let itemRect = s.el.getBoundingClientRect();
+                let submenuWidth = 250;
+                let submenuTop = itemRect.y;
+                let submenuLeft = rect.x + rect.width - 2; // Position to the right of parent
+
+                // Check if parent was positioned to the left (has negative margin or is on left side)
+                let parentOpenedLeft = parent.openedLeft || false;
+
+                // Check horizontal space
+                let spaceOnRight = window.innerWidth - (rect.x + rect.width);
+                let spaceOnLeft = rect.x;
+
+                // Determine which side to open the submenu
+                let openLeft = parentOpenedLeft; // Follow parent's direction by default
+
+                // If parent opened to right, check if we still have space
+                if (!parentOpenedLeft && spaceOnRight < submenuWidth + 10) {
+                    // Not enough space on right, switch to left
+                    openLeft = true;
+                }
+                // If parent opened to left, check if we still have space on left
+                if (parentOpenedLeft && spaceOnLeft < submenuWidth + 10) {
+                    // Not enough space on left, switch to right if possible
+                    if (spaceOnRight >= submenuWidth + 10) {
+                        openLeft = false;
+                    }
+                }
+
+                if (openLeft) {
+                    // Position to the left of parent menu
+                    submenuLeft = rect.x - submenuWidth + 2;
+                    // Ensure it doesn't go off the left edge
+                    if (submenuLeft < 10) {
+                        submenuLeft = 10;
+                    }
+                    current.openedLeft = true;
+                } else {
+                    current.openedLeft = false;
+                }
+
+                // Set position
+                current.modal.top = submenuTop;
+                current.modal.left = submenuLeft;
+
+                // Adjust vertical position after render
+                queueMicrotask(() => {
+                    let submenuEl = current.modal.el;
+                    let submenuRect = submenuEl.getBoundingClientRect();
+
+                    // Check if submenu goes off the bottom
+                    if (submenuRect.bottom > window.innerHeight - 10) {
+                        let overflow = submenuRect.bottom - (window.innerHeight - 10);
+                        let newTop = submenuTop - overflow;
+                        // Don't go above the top of the screen
+                        if (newTop < 10) {
+                            newTop = 10;
+                        }
+                        current.modal.top = newTop;
+                    }
+                });
+
                 // Keep current item for each modal
                 current.item = s;
                 s.expanded = true;
@@ -6052,6 +6132,7 @@ if (! Modal && "function" === 'function') {
                         menu.item.expanded = false;
                         menu.item = null;
                     }
+                    menu.openedLeft = false;
                     menu.modal.close();
                 }
             });
@@ -12409,7 +12490,7 @@ function Path(pathString, value, remove) {
             if (
                 currentObject != null &&
                 isValidPathObj(currentObject) &&
-                Object.prototype.hasOwnProperty.call(currentObject, key)
+                key in currentObject
             ) {
                 currentObject = currentObject[key];
             } else {
@@ -12434,11 +12515,11 @@ function Path(pathString, value, remove) {
 
         // If the key exists but is null/undefined or a non-object, replace it with an empty object
         if (
-            Object.prototype.hasOwnProperty.call(currentObject, key) &&
+            key in currentObject &&
             (currentObject[key] == null || ! isValidPathObj(currentObject[key]))
         ) {
             currentObject[key] = {};
-        } else if (!Object.prototype.hasOwnProperty.call(currentObject, key)) {
+        } else if (!(key in currentObject)) {
             // If the key doesn't exist, create an empty object
             currentObject[key] = {};
         }
@@ -12457,7 +12538,7 @@ function Path(pathString, value, remove) {
 
     // Delete the property if remove is true
     if (remove === true) {
-        if (Object.prototype.hasOwnProperty.call(currentObject, finalKey)) {
+        if (finalKey in currentObject) {
             delete currentObject[finalKey];
             return true;
         }
@@ -23065,7 +23146,7 @@ var jSuites = {
     ...dictionary,
     ...helpers,
     /** Current version */
-    version: '6.1.2',
+    version: '6.2.0',
     /** Bind new extensions to Jsuites */
     setExtensions: function(o) {
         if (typeof(o) == 'object') {

package/package.json

@@ -26,16 +26,16 @@
     },
     "main": "dist/jsuites.js",
     "types": "dist/jsuites.d.ts",
-    "version": "6.1.2",
+    "version": "6.2.0",
     "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.1",
+        "@lemonadejs/contextmenu": "^5.8.3",
         "@lemonadejs/dropdown": "^5.8.2",
         "@lemonadejs/modal": "^5.8.2",
         "@lemonadejs/rating": "^5.8.1",