@eintrek/erp-shell 0.1.55 → 0.1.56

package/dist/index.js

@@ -762,6 +762,7 @@ function getActiveSubModule(pathname, modules) {
 }
 /** Prepend `code` (org code) to a relative URL so `/sales` → `/O25.../sales`.
  * Absolute `http(s)://` URLs are left intact; optional `{code}` placeholder is replaced.
+ * Query/hash are preserved: `/?start=1` → `/O25...?start=1` (not `/O25.../?start=1`).
  */
 function buildUrlWithCode(code, url) {
     if (/^https?:\/\//i.test(url)) {
@@ -771,8 +772,13 @@ function buildUrlWithCode(code, url) {
     }
     if (!code)
         return url;
-    const cleanUrl = url.startsWith("/") ? url.slice(1) : url;
-    return `/${code}/${cleanUrl}`;
+    const match = url.match(/^([^?#]*)(\?[^#]*)?(#.*)?$/);
+    const path = match?.[1] ?? url;
+    const query = match?.[2] ?? "";
+    const hash = match?.[3] ?? "";
+    const cleanPath = path.startsWith("/") ? path.slice(1) : path;
+    const base = cleanPath ? `/${code}/${cleanPath}` : `/${code}`;
+    return `${base}${query}${hash}`;
 }
 
 function NavTools({ tools, closeOnNavigation = false }) {
@@ -1863,10 +1869,14 @@ function NavMain({ items, orgCode, closeOnNavigation = false, approvalCounts, ch
             !!item.subModules?.some(subItem => subItem.subPages?.some(subPage => isPathActive(pathname, buildUrlWithCode(code, subPage.url)) ||
                 isPathActive(pathname, subPage.url)));
         // Parent only active when path matches its URL exactly AND no child
-        // is active (so parent+child don't both light up).
-        const isItemActive = (highlightActiveModule && !item.subModules?.length && !!item.isActive) ||
-            ((workspace ? samePage(pathname, itemUrl) : pathname === itemUrl) &&
-                !hasActiveSubItem);
+        // is active (so parent+child don't both light up). When the app opts
+        // into highlightActiveModule, leaf items trust `item.isActive` alone —
+        // needed for query-only hub actions (`/?start=1`) that share a path
+        // with another leaf (e.g. "แอปของฉัน" at `/`).
+        const isItemActive = highlightActiveModule && !item.subModules?.length
+            ? !!item.isActive
+            : (workspace ? samePage(pathname, itemUrl) : pathname === itemUrl) &&
+                !hasActiveSubItem;
         return { itemUrl, activeSubItemUrl, hasActiveSubItem, isItemActive };
     });
     // A group opens when its page becomes current and otherwise stays as the