ml-ui-lib 1.0.27 → 1.0.29

package/dist/components/Navbar/Navbar.css

@@ -15,6 +15,7 @@
     align-items: center;
     max-width: 1200px;
     margin: 0 auto;
+    padding: 1rem;
 }
 
 .navbar-logo img {
@@ -26,7 +27,6 @@
 ------------------------- */
 .nav-items {
     display: flex;
-    overflow: none;
     gap: 1.5rem;
 }
 
@@ -38,19 +38,37 @@
     cursor: pointer;
 }
 
-/* Dropdown menu */
+/* Desktop dropdown bubble */
+.navbar-dropdown-content {
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    top: 15px;
+    padding: 12px 45px 12px 20px;
+    background: #fff;
+    border-radius: 22px;
+    box-shadow: 0 10px 25px rgba(0, 0, 0, 0.15);
+}
+
+.navbar-dropdown-content::before {
+    content: "";
+    position: absolute;
+    top: -8px;
+    right: 30px;
+    width: 15px;
+    height: 15px;
+    background: #fff;
+    transform: rotate(45deg);
+    box-shadow: -4px 2px 8px rgba(0, 0, 0, 0.05);
+}
+
 .navbar-dropdown {
-    /* hidden by default */
-    display: none;
-    padding: 20px 25px 10px 10px;
     position: absolute;
     top: 20px;
-    left: -25px;
-    background: #fff;
-    min-width: 180px;
-    /* box-shadow: 0 8px 20px rgba(0, 0, 0, 0.15); */
+    left: -35px;
+    display: none;
+    z-index: 10;
     flex-direction: column;
-    z-index: 999;
 }
 
 .navbar-dropdown-link {
@@ -64,12 +82,12 @@
     background: #f2f2f2;
 }
 
-/* Show dropdown on hover (desktop) */
+/* Desktop hover */
 .navbar-item.has-dropdown:hover .navbar-dropdown {
     display: flex;
 }
 
-/* Add linear caret for items with dropdown */
+/* Caret arrow */
 .navbar-item.has-dropdown>.navbar-link::after {
     content: ">";
     display: inline-block;
@@ -80,6 +98,10 @@
     transform: rotate(90deg);
 }
 
+.separator {
+    display: block !important;
+}
+
 /* -------------------------
    Navbar Links
 ------------------------- */
@@ -95,28 +117,15 @@
     font-weight: 400;
     font-size: 17px;
     transition: color 0.2s;
-    display: inline-block;
-    /* allows width & height */
-    width: auto;
-    /* default for desktop */
 }
 
-/* Style for parent items with sublinks (desktop) */
 .navbar-link.parent-link {
     cursor: default;
-    /* show pointer as normal arrow, not hand */
     color: #333 !important;
-    /* normal text color */
-    /* font-weight: 500; */
-    /* optional: slightly bolder */
 }
 
-/* Prevent hover effect for parent items */
 .navbar-link.parent-link:hover {
-    color: #333;
-    /* do not turn red */
     background: none;
-    /* no background change */
 }
 
 .navbar-links a:hover {
@@ -168,88 +177,76 @@
 /* -------------------------
    Responsive
 ------------------------- */
-@media (min-width: 1000px) {
-    .navbar-container {
-        padding: 1rem 5rem;
-    }
-}
-
-@media (min-width: 993px) {
+@media (max-width: 992px) {
     .navbar-container {
-        padding: 1rem 0;
+        margin: 0 20px;
+        padding: 1rem 1.5rem;
+        justify-content: space-between;
     }
-}
 
-@media (max-width: 500px) {
-    .navbar-container {
-        margin: 0 !important;
-    }
-}
-
-.mobile-login-btn {
-    display: none;
-}
-
-/* -------------------------
-   Mobile Menu
-------------------------- */
-@media (max-width: 992px) {
-    /* .navbar-item.has-dropdown>.navbar-link::after {
-        display: none;
-    } */
-
-    .separator {
+    .navbar-item.has-dropdown:hover .navbar-dropdown {
         display: none;
     }
 
-    .mobile-login-btn {
-        display: block;
+    .burger {
+        display: flex;
+        z-index: 10000;
     }
 
+    .separator,
     .login-btn {
         display: none !important;
     }
 
-    .burger {
-        display: flex;
-        z-index: 10000;
-    }
-
-    .navbar-container {
-        margin: 0 20px;
-        padding: 1rem 1.5rem;
-        justify-content: space-between;
+    .mobile-login-btn {
+        display: block;
+        position: fixed;
+        bottom: 0;
+        /* left: 0; */
+        width: 400px;
+        padding: 1.3rem;
+        border: none;
+        color: #333;
+        font-size: 1.1rem;
+        font-weight: 600;
+        z-index: 99;
     }
 
-    .nav-items {
-        gap: 0px;
-        flex-direction: column;
-        overflow: auto;
+    .navbar-dropdown-content {
+        padding: 0px !important;
     }
 
     .navbar-links {
         position: fixed;
         top: 0;
         right: -100%;
-        height: 100vh;
         width: 400px;
+        height: 100vh;
         background: #fff;
         flex-direction: column;
         padding: 65px 0px 70px;
         transition: right 0.3s ease-in-out;
         box-shadow: -4px 0 12px rgba(0, 0, 0, 0.1);
         z-index: 9999;
+        overflow-y: auto;
     }
 
     .navbar-links.open {
         right: 0;
     }
 
+    .nav-items {
+        flex-direction: column;
+        gap: 0;
+        overflow: visible;
+    }
+
     .navbar-links a {
         display: block;
         width: 100%;
         padding: 1rem 50px;
         font-size: 1.2rem;
+        color: #333;
     }
 
     .navbar-links a:hover {
@@ -257,48 +254,78 @@
         color: #fff;
     }
 
-    .navbar-links a.active:hover {
-        color: #fff;
+    /* -------------------------
+       Mobile accordion
+    ------------------------- */
+    .navbar-item.has-dropdown {
+        display: flex;
+        flex-direction: column;
+        width: 100%;
+    }
+
+    /* arrow */
+    .navbar-item.has-dropdown .navbar-link::after {
+        content: "▸";
+        margin-left: auto;
+        transition: transform 0.3s ease;
+        float: right;
+    }
+
+    .navbar-item.has-dropdown.open .navbar-link::after {
+        transform: rotate(90deg);
     }
 
-    /* Mobile dropdown inside sliding menu */
+    /* remove absolute, make dropdown push content */
     .navbar-dropdown {
-        position: static;
-        display: flex !important;
+        display: none;
         flex-direction: column;
-        background: transparent;
+        width: 100%;
+        /* margin-top: 0.3rem; */
+    }
+
+    /* show when open */
+    .navbar-item.has-dropdown.open .navbar-dropdown {
+        position: static;
+        display: flex;
+    }
+
+    .navbar-item.has-dropdown.open .navbar-dropdown a {
+        padding-left: 70px;
+    }
+
+    .navbar-dropdown-content {
+        padding: 0.5rem 1rem;
+        /* margin: 0.2rem 0; */
+        top: 0px;
+        border-radius: 8px;
+        background: #fff;
         box-shadow: none;
-        padding: 0px;
+    }
+
+    .navbar-dropdown-content::before,
+    .navbar-dropdown-content::after {
+        display: none;
     }
 
     .navbar-dropdown-link {
-        padding-left: 50px;
+        padding: 0.7rem 1rem;
+        font-size: 1rem;
         color: #333;
+        white-space: normal;
     }
 
     .has-dropdown .navbar-dropdown-link {
-        padding: 1rem 70px;
-    }
-
-    /* MOBILE LOGIN FIXED AT BOTTOM */
-    .mobile-login-btn {
-        position: absolute;
-        bottom: 0;
-        left: 0;
-        width: 100%;
-        padding: 1.3rem;
-        border: none;
-        color: #333;
-        font-size: 1.1rem;
-        font-weight: 600;
+        padding-left: 1.5rem;
     }
 }
 
+
 /* -------------------------
-   Login Button
+   Login & Panels
 ------------------------- */
 .login-btn {
-    color: #333;
+    color: #e00000;
+    font-weight: 700;
     border: none;
     border-radius: 6px;
     cursor: pointer;
@@ -314,11 +341,6 @@
     font-weight: 500;
 }
 
-.navbar-login-panel .spb-header {
-    padding: 0 !important;
-    border-bottom: none !important;
-}
-
 .navbar-panel-content {
     padding: 20px;
 }
@@ -353,7 +375,6 @@
         width: 280px;
         height: 80px;
         background: url(https://mlhuillier.com/img/revamp/ml-logo-2.svg) center/contain no-repeat;
-        opacity: 1;
         pointer-events: none;
         z-index: 1;
     }
@@ -366,6 +387,10 @@
     .navbar-links {
         width: 100%;
     }
+
+    .mobile-login-btn {
+        width: 100%;
+    }
 }
 
 /* Right-side group */

package/dist/components/Navbar/Navbar.js

@@ -3,7 +3,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { useState, useEffect } from 'react';
 import './Navbar.css';
 import { SlidingPanel } from '../SlidingPanel/SlidingPanel';
-export const Navbar = ({ siteUrl, items, logoSrc = '', logoAlt = 'M Lhuillier Logo', logoWidth = 220, logoHeight = 40, className = '', login = false, logedinData = null, loginContent, otherContent, onClose, }) => {
+export const Navbar = ({ siteUrl, items, logoSrc = '', logoAlt = 'Logo', logoWidth = 220, logoHeight = 40, className = '', login = false, logedinData = null, loginContent, otherContent, onClose, }) => {
     const [menuOpen, setMenuOpen] = useState(false);
     const [showLogin, setShowLogin] = useState(false);
     const [isClosing, setIsClosing] = useState(false);
@@ -21,13 +21,10 @@ export const Navbar = ({ siteUrl, items, logoSrc = '', logoAlt = 'M Lhuillier Lo
         if (!menuOpen)
             setOpenDropdown(null);
     }, [menuOpen]);
-    const toggleMenu = () => setMenuOpen((prev) => !prev);
+    const toggleMenu = () => setMenuOpen(prev => !prev);
     const toggleLogin = () => {
         setMenuOpen(false);
-        setShowLogin((prev) => !prev);
-    };
-    const toggleDropdown = (name) => {
-        setOpenDropdown(prev => (prev === name ? null : name));
+        setShowLogin(prev => !prev);
     };
     const handleInternalClose = () => {
         setIsClosing(true);
@@ -39,14 +36,8 @@ export const Navbar = ({ siteUrl, items, logoSrc = '', logoAlt = 'M Lhuillier Lo
         }, 350);
     };
     useEffect(() => {
-        if (menuOpen) {
-            document.body.style.overflow = 'hidden';
-            document.body.style.touchAction = 'none';
-        }
-        else {
-            document.body.style.overflow = '';
-            document.body.style.touchAction = '';
-        }
+        document.body.style.overflow = menuOpen ? 'hidden' : '';
+        document.body.style.touchAction = menuOpen ? 'none' : '';
         return () => {
             document.body.style.overflow = '';
             document.body.style.touchAction = '';
@@ -54,30 +45,21 @@ export const Navbar = ({ siteUrl, items, logoSrc = '', logoAlt = 'M Lhuillier Lo
     }, [menuOpen]);
     return (_jsxs(_Fragment, { children: [_jsx("nav", { className: `navbar ${className}`, children: _jsxs("div", { className: "navbar-container", children: [_jsx("div", { className: "navbar-logo", children: _jsx("a", { href: siteUrl, className: "navbar-brand", children: _jsx("img", { src: logoSrc, alt: logoAlt, width: logoWidth, height: logoHeight, style: { cursor: 'pointer', display: 'block' } }) }) }), _jsxs("div", { style: { display: 'flex', flexDirection: 'row', gap: '10px', alignItems: 'center' }, children: [_jsxs("div", { className: `navbar-links ${menuOpen ? 'open' : ''}`, children: [_jsx("div", { className: "nav-items", children: items.map(item => {
                                                 const hasSubLinks = item.subLinks && item.subLinks.length > 0;
-                                                const linkPath = new URL(item.link, 'https://dummybase').pathname;
+                                                const linkPath = new URL(item.link || '#', 'https://dummybase').pathname;
                                                 const isActive = currentPath === linkPath;
                                                 const isDropdownOpen = openDropdown === item.name;
-                                                return (_jsxs("div", { className: `navbar-item ${hasSubLinks ? 'has-dropdown' : ''} ${isDropdownOpen ? 'open' : ''}`, children: [_jsx("a", { href: hasSubLinks && !isMobile ? '#' : item.link, target: item.target || '_self', className: `navbar-link ${isActive ? 'active' : ''} ${hasSubLinks && !isMobile ? 'parent-link' : ''}`, onClick: (e) => {
-                                                                if (hasSubLinks) {
-                                                                    if (isMobile) {
-                                                                        e.preventDefault();
-                                                                        toggleDropdown(item.name);
-                                                                    }
-                                                                    else {
-                                                                        e.preventDefault(); // prevent desktop click
-                                                                    }
+                                                return (_jsxs("div", { className: `navbar-item ${hasSubLinks ? 'has-dropdown' : ''} ${isDropdownOpen ? 'open' : ''}`, children: [_jsx("a", { href: hasSubLinks ? '#' : item.link, target: item.target || '_self', className: `navbar-link ${isActive ? 'active' : ''} ${hasSubLinks ? 'parent-link' : ''}`, onClick: (e) => {
+                                                                if (hasSubLinks && isMobile) {
+                                                                    e.preventDefault();
+                                                                    setOpenDropdown(prev => (prev === item.name ? null : item.name));
                                                                 }
                                                                 else {
                                                                     setMenuOpen(false);
                                                                 }
-                                                            }, children: item.name }), hasSubLinks && (_jsx("div", { className: "navbar-dropdown", style: {
-                                                                display: isMobile
-                                                                    ? isDropdownOpen ? 'flex' : 'none'
-                                                                    : undefined,
-                                                            }, children: item.subLinks.map(sub => (_jsx("a", { href: sub.link, target: sub.target || '_self', className: "navbar-dropdown-link", onClick: () => {
-                                                                    setMenuOpen(false);
-                                                                    setOpenDropdown(null);
-                                                                }, children: sub.name }, sub.name))) }))] }, item.name));
-                                            }) }), isMobile && login && !logedinData && (_jsx("button", { className: "mobile-login-btn", onClick: toggleLogin, children: "Login" }))] }), _jsx("div", { className: 'separator', style: { color: '#aaaaaa', fontSize: '27px', padding: '0 15px' }, children: " | " }), _jsxs("div", { className: "navbar-right", children: [_jsxs("button", { className: `burger ${menuOpen ? 'active' : ''}`, onClick: toggleMenu, "aria-label": "Toggle menu", children: [_jsx("span", {}), _jsx("span", {}), _jsx("span", {})] }), !isMobile && login && !logedinData && (_jsx("span", { style: { color: '#e00000', fontWeight: '700' }, className: "login-btn", onClick: toggleLogin, children: "Login" }))] })] })] }) }), login && !logedinData && (_jsx(_Fragment, { children: !isMobile ? (showLogin && (_jsxs(_Fragment, { children: [_jsx("div", { className: "overlay-side-content", children: otherContent }), _jsx("div", { className: "navbar-login-panel", children: _jsxs(SlidingPanel, { isOpen: showLogin && !isClosing, width: "400px", height: "100%", position: "right", closeOnOverlayClick: false, onClose: handleInternalClose, children: [_jsx("div", { className: "navbar-panel-header" }), _jsx("div", { className: "navbar-panel-content", children: loginContent })] }) })] }))) : (_jsx("div", { className: "navbar-login-panel", children: _jsxs(SlidingPanel, { isOpen: showLogin, height: "70%", position: "bottom", onClose: handleInternalClose, children: [_jsx("div", { className: "navbar-panel-header" }), _jsx("div", { className: "navbar-panel-content", children: loginContent })] }) })) }))] }));
+                                                            }, children: item.name }), hasSubLinks && (_jsx("div", { className: "navbar-dropdown", children: _jsx("div", { className: "navbar-dropdown-content", children: item.subLinks.map(sub => (_jsx("a", { href: sub.link, target: sub.target || '_self', className: "navbar-dropdown-link", onClick: () => {
+                                                                        setMenuOpen(false);
+                                                                        setOpenDropdown(null);
+                                                                    }, children: sub.name }, sub.name))) }) }))] }, item.name));
+                                            }) }), isMobile && login && !logedinData && (_jsx("div", { className: 'navbar-item', style: { background: '#ffffff' }, children: _jsx("button", { className: "mobile-login-btn", onClick: toggleLogin, children: "Login" }) }))] }), _jsx("div", { className: 'separator', style: { color: '#aaaaaa', fontSize: '27px', padding: '0 15px' }, children: " | " }), _jsxs("div", { className: "navbar-right", children: [_jsxs("button", { className: `burger ${menuOpen ? 'active' : ''}`, onClick: toggleMenu, children: [_jsx("span", {}), _jsx("span", {}), _jsx("span", {})] }), !isMobile && login && !logedinData && (_jsx("span", { className: "login-btn", onClick: toggleLogin, children: "Login" }))] })] })] }) }), login && !logedinData && (_jsx(_Fragment, { children: !isMobile ? (showLogin && (_jsxs(_Fragment, { children: [_jsx("div", { className: "overlay-side-content", children: otherContent }), _jsx("div", { className: "navbar-login-panel", children: _jsxs(SlidingPanel, { isOpen: showLogin && !isClosing, width: "400px", height: "100%", position: "right", closeOnOverlayClick: false, onClose: handleInternalClose, children: [_jsx("div", { className: "navbar-panel-header" }), _jsx("div", { className: "navbar-panel-content", children: loginContent })] }) })] }))) : (_jsx("div", { className: "navbar-login-panel", children: _jsxs(SlidingPanel, { isOpen: showLogin, height: "70%", position: "bottom", onClose: handleInternalClose, children: [_jsx("div", { className: "navbar-panel-header" }), _jsx("div", { className: "navbar-panel-content", children: loginContent })] }) })) }))] }));
 };
 export default Navbar;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ml-ui-lib",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
   "types": "dist/index.d.ts",