jsuites 6.1.3 → 6.2.1

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

@@ -4618,7 +4618,7 @@ const Mask = utils.Mask;
                 } else {
                     setCursor(s);
 
-                    update();
+                    update(e);
                 }
             }
         }
@@ -4626,7 +4626,10 @@ const Mask = utils.Mask;
         // Update Calendar
         const update = function(e) {
             self.setValue(getValue());
-            self.close({ origin: 'button' });
+
+            if (! (e && e.type === 'click' && e.target.tagName === 'DIV' && self.time === true)) {
+                self.close({ origin: 'button' });
+            }
         }
 
         const reset = function() {
@@ -4906,7 +4909,7 @@ const Mask = utils.Mask;
                         }
                     } else if (e.code === 'Enter') {
                         if (! self.isClosed()) {
-                            update();
+                            update(e);
                         } else {
                             self.open();
                         }
@@ -5734,7 +5737,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>`;
@@ -5809,9 +5812,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;
@@ -6072,6 +6135,7 @@ if (! Modal && "function" === 'function') {
                         menu.item.expanded = false;
                         menu.item = null;
                     }
+                    menu.openedLeft = false;
                     menu.modal.close();
                 }
             });
@@ -12429,7 +12493,7 @@ function Path(pathString, value, remove) {
             if (
                 currentObject != null &&
                 isValidPathObj(currentObject) &&
-                Object.prototype.hasOwnProperty.call(currentObject, key)
+                key in currentObject
             ) {
                 currentObject = currentObject[key];
             } else {
@@ -12454,11 +12518,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] = {};
         }
@@ -12477,7 +12541,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;
         }
@@ -23085,7 +23149,7 @@ var jSuites = {
     ...dictionary,
     ...helpers,
     /** Current version */
-    version: '6.1.2',
+    version: '6.2.1',
     /** 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.3",
+    "version": "6.2.1",
     "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.4",
-        "@lemonadejs/calendar": "^5.8.3",
+        "@lemonadejs/calendar": "^5.8.4",
         "@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",