@eintrek/erp-shell 0.1.43 → 0.1.45

package/dist/index.js

@@ -1106,7 +1106,7 @@ function NavMain({ items, orgCode, closeOnNavigation = false, approvalCounts, })
                 // is active (so parent+child don't both light up).
                 const isItemActive = pathname === itemUrl && !hasActiveSubItem;
                 item.icon;
-                return (jsxRuntime.jsx(erpTheme.Collapsible, { asChild: true, defaultOpen: isItemActive || hasActiveSubItem, className: "group/collapsible", children: jsxRuntime.jsxs(SidebarMenuItem, { children: [jsxRuntime.jsx(erpTheme.CollapsibleTrigger, { asChild: true, children: jsxRuntime.jsx(SidebarMenuButton, { asChild: !item.subModules || item.subModules.length === 0, isActive: isItemActive, className: " data-[state=open]:text-sidebar-accent-foreground", children: item.subModules && item.subModules.length > 0 ? (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx("span", { id: item.id, children: item.titleTh }), jsxRuntime.jsx(lucideReact.ChevronRight, { className: "ml-auto transition-transform duration-200 group-data-[state=open]/collapsible:rotate-90" })] })) : (jsxRuntime.jsx(Link, { href: itemUrl, className: "flex items-center gap-2 w-full min-w-0 flex-1", onClick: handleNavLinkClick, children: jsxRuntime.jsx("span", { id: item.id, className: "flex-1 truncate", title: item.titleTh, children: item.titleTh }) })) }) }), item.subModules && item.subModules.length > 0 && (jsxRuntime.jsx(erpTheme.CollapsibleContent, { children: jsxRuntime.jsx(SidebarMenuSub, { children: item.subModules.map(subItem => {
+                return (jsxRuntime.jsx(erpTheme.Collapsible, { asChild: true, defaultOpen: isItemActive || hasActiveSubItem, className: "group/collapsible", children: jsxRuntime.jsxs(SidebarMenuItem, { children: [jsxRuntime.jsx(erpTheme.CollapsibleTrigger, { asChild: true, children: jsxRuntime.jsx(SidebarMenuButton, { asChild: !item.subModules || item.subModules.length === 0, isActive: isItemActive, className: " data-[state=open]:text-sidebar-accent-foreground", children: item.subModules && item.subModules.length > 0 ? (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx("span", { id: item.id, children: item.titleTh }), jsxRuntime.jsx(lucideReact.ChevronRight, { className: "ml-auto transition-transform duration-200 group-data-[state=open]/collapsible:rotate-90" })] })) : (jsxRuntime.jsx(Link, { href: itemUrl, prefetch: false, className: "flex items-center gap-2 w-full min-w-0 flex-1", onClick: handleNavLinkClick, children: jsxRuntime.jsx("span", { id: item.id, className: "flex-1 truncate", title: item.titleTh, children: item.titleTh }) })) }) }), item.subModules && item.subModules.length > 0 && (jsxRuntime.jsx(erpTheme.CollapsibleContent, { children: jsxRuntime.jsx(SidebarMenuSub, { children: item.subModules.map(subItem => {
                                         const subItemUrl = buildUrlWithCode(code, subItem.url);
                                         const isSubItemActive = subItemUrl === activeSubItemUrl;
                                         const SubIcon = subItem.icon;
@@ -1123,10 +1123,10 @@ function NavMain({ items, orgCode, closeOnNavigation = false, approvalCounts, })
                                                                     const SubPageIcon = subPage.icon;
                                                                     return (jsxRuntime.jsx(SidebarMenuSubItem, { children: jsxRuntime.jsx(SidebarMenuSubButton, { asChild: true, className: `font-thai w-full text-sm ${isSubPageActive
                                                                                 ? "text-sidebar-accent-foreground font-medium"
-                                                                                : "text-sidebar-foreground"}`, isActive: false, children: jsxRuntime.jsxs(Link, { href: subPageUrl, className: "w-full flex items-center", onClick: handleNavLinkClick, children: [SubPageIcon && (jsxRuntime.jsx(SubPageIcon, { className: "sidebar-subpage-icon flex-shrink-0" })), jsxRuntime.jsx("span", { className: "flex-1 truncate", title: subPage.titleTh, children: subPage.titleTh })] }) }) }, subPage.id));
+                                                                                : "text-sidebar-foreground"}`, isActive: false, children: jsxRuntime.jsxs(Link, { href: subPageUrl, prefetch: false, className: "w-full flex items-center", onClick: handleNavLinkClick, children: [SubPageIcon && (jsxRuntime.jsx(SubPageIcon, { className: "sidebar-subpage-icon flex-shrink-0" })), jsxRuntime.jsx("span", { className: "flex-1 truncate", title: subPage.titleTh, children: subPage.titleTh })] }) }) }, subPage.id));
                                                                 }) }) })] }) }, subItem.id));
                                         }
-                                        return (jsxRuntime.jsx(SidebarMenuSubItem, { children: jsxRuntime.jsx(SidebarMenuSubButton, { asChild: true, className: "w-full", isActive: isSubItemActive, children: jsxRuntime.jsxs(Link, { href: subItemUrl, className: "w-full flex items-center", onClick: handleNavLinkClick, children: [SubIcon && (jsxRuntime.jsx(SubIcon, { className: "sidebar-submodule-icon flex-shrink-0" })), jsxRuntime.jsx("span", { className: "flex-1 truncate", title: subItem.titleTh, children: subItem.titleTh }), approvalCount > 0 && (jsxRuntime.jsx(erpTheme.Badge, { variant: "destructive", className: "ml-auto h-5 min-w-5 px-1.5 text-xs font-medium tabular-nums", children: approvalCount > 99 ? "99+" : approvalCount }))] }) }) }, subItem.id));
+                                        return (jsxRuntime.jsx(SidebarMenuSubItem, { children: jsxRuntime.jsx(SidebarMenuSubButton, { asChild: true, className: "w-full", isActive: isSubItemActive, children: jsxRuntime.jsxs(Link, { href: subItemUrl, prefetch: false, className: "w-full flex items-center", onClick: handleNavLinkClick, children: [SubIcon && (jsxRuntime.jsx(SubIcon, { className: "sidebar-submodule-icon flex-shrink-0" })), jsxRuntime.jsx("span", { className: "flex-1 truncate", title: subItem.titleTh, children: subItem.titleTh }), approvalCount > 0 && (jsxRuntime.jsx(erpTheme.Badge, { variant: "destructive", className: "ml-auto h-5 min-w-5 px-1.5 text-xs font-medium tabular-nums", children: approvalCount > 99 ? "99+" : approvalCount }))] }) }) }, subItem.id));
                                     }) }) }))] }) }, item.id));
             }) }) }));
 }
@@ -1669,27 +1669,40 @@ function writeThemeCookie(value) {
 /**
  * Bridges next-themes (per-origin localStorage) with a cookie scoped to the
  * parent domain, so the light/dark/system choice is shared across the
- * accounting / HR / platform subdomains. On load it adopts the shared cookie;
- * on every later change it writes the cookie back.
+ * accounting / HR / platform subdomains.
+ *
+ * Local storage wins when it already has a value (H57): adopting the shared
+ * cookie first used to overwrite an explicit choice — including one set via
+ * DevTools — and write `theme=light` back on every load whenever the cookie
+ * still said light. Push the local value into the cookie instead so sibling
+ * apps catch up.
  */
 function ThemeCookieSync() {
     const { theme, setTheme } = nextThemes.useTheme();
     const skipFirstWrite = React__namespace.useRef(true);
     React__namespace.useEffect(() => {
+        const local = typeof window !== "undefined"
+            ? window.localStorage.getItem("theme")
+            : null;
         const cookie = readThemeCookie();
-        if (cookie) {
+        if (local) {
+            if (local !== theme)
+                setTheme(local);
+            writeThemeCookie(local);
+        }
+        else if (cookie) {
             if (cookie !== theme)
                 setTheme(cookie);
         }
         else if (theme) {
-            writeThemeCookie(theme); // seed the shared cookie the first time
+            writeThemeCookie(theme);
         }
         // Run once on mount — `theme` is intentionally not a dependency here.
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     React__namespace.useEffect(() => {
         // Skip the initial render; only persist genuine changes (incl. the
-        // setTheme() triggered by adopting the cookie above — harmless re-write).
+        // setTheme() triggered by adopting storage above — harmless re-write).
         if (skipFirstWrite.current) {
             skipFirstWrite.current = false;
             return;