@inera/ids-react 7.2.0 → 8.0.0

package/components/header-1177/header-1177.js

@@ -5,40 +5,24 @@ import clsx from 'clsx';
 import '@inera/ids-design/components/header-1177/header-1177.css';
 import { HeaderProvider } from '../utils/contexts/HeaderContext.js';
 
-const IDSHeader1177 = ({ regionPickerText = "Välj region", srLogoLabel = "Logotyp", hideRegionPicker: initialRegionPicker = false, regionPickerExpanded: initialExpanded = false, fluid = false, unresponsive = false, logoHref = "", logoProps = {}, logo, regionIcon, skipToContentLink, onToggleRegion, items, avatar, mobileMenu, className, children }) => {
-    const [regionPickerExpanded, setRegionPickerExpanded] = useState(initialExpanded);
+const IDSHeader1177 = ({ srLogoText = "Logotyp", hideRegionPicker: initialRegionPicker = false, unresponsive = false, logoHref = "", logoProps = {}, logo, regionPicker, skipToContentLink, items, avatar, className, children, ...props }) => {
     const [hideRegionPicker, setHideRegionPicker] = useState(initialRegionPicker);
-    const regionIconRef = useRef(null);
+    useRef(null);
     useEffect(() => {
         if (avatar) {
             // No region picker when avatar
-            setRegionPickerExpanded(false);
             setHideRegionPicker(true);
         }
         else {
             setHideRegionPicker(initialRegionPicker);
         }
     }, [avatar]);
-    const toggleRegion = () => {
-        setRegionPickerExpanded(prev => !prev);
-        onToggleRegion?.(!regionPickerExpanded);
-    };
-    const renderRegion = () => {
-        if (hideRegionPicker)
-            return null;
-        return (jsxs("div", { className: clsx("ids-header-1177__region", {
-                "ids-header-1177__region--selected": !!regionIcon
-            }), children: [jsx("span", { className: "ids-header-1177__region-icon", ref: regionIconRef, children: regionIcon }), jsx("span", { className: "ids-header-1177__region-picker", children: jsx("button", { onClick: toggleRegion, className: clsx("ids-header-1177__region-picker__button", {
-                            "ids-header-1177__region-picker__button--expanded": regionPickerExpanded
-                        }), "aria-label": regionPickerText, children: jsx("span", { className: "ids-header-1177__region-picker__text", children: regionPickerText }) }) })] }));
-    };
     const renderLogo = () => {
-        return (jsx("div", { className: "ids-header-1177__logo-wrapper", children: jsx("div", { className: "ids-header-1177__logo", children: logo ? (jsx("span", { className: "ids-header-1177__link", children: logo })) : (jsx("a", { className: "ids-header-1177__logo-link", href: logoHref, "aria-label": srLogoLabel, ...logoProps })) }) }));
+        return (jsx("div", { className: "ids-header-1177__logo-wrapper", children: jsx("div", { className: "ids-header-1177__logo", children: logo ? (jsx("span", { className: "ids-header-1177__link", children: logo })) : (jsx("a", { className: "ids-header-1177__logo-link", href: logoHref, "aria-label": srLogoText, ...logoProps })) }) }));
     };
-    return (jsx(HeaderProvider, { value: { unresponsive, fluid }, children: jsxs("header", { className: clsx("ids-header-1177", {
-                "ids-header-1177--unresponsive": unresponsive,
-                "ids-header-1177--fluid": fluid
-            }, className), children: [skipToContentLink && (jsx("div", { className: "ids-header-1177__skip-to-content", children: skipToContentLink })), jsx("div", { className: "ids-header-1177__container", children: jsxs("div", { className: "ids-header-1177__inner", children: [jsxs("div", { className: "ids-header-1177__inner-left", children: [renderLogo(), renderRegion()] }), jsx("div", { className: "ids-header-1177__inner-right", children: jsxs("div", { className: "ids-header-1177__items", children: [items, " ", avatar, mobileMenu && jsx("div", { className: "ids-header-1177__mobile-menu", children: mobileMenu })] }) })] }) }), children] }) }));
+    return (jsx(HeaderProvider, { value: { unresponsive, hideRegionPicker }, children: jsxs("header", { className: clsx("ids-header-1177", {
+                "ids-header-1177--unresponsive": unresponsive
+            }, className), ...props, children: [skipToContentLink && jsx("div", { className: "ids-header-1177__skip-to-content", children: skipToContentLink }), jsxs("div", { className: "ids-header-1177__container", children: [jsx("div", { className: "ids-header-1177__left" }), jsxs("div", { className: "ids-header-1177__inner", children: [jsxs("div", { className: "ids-header-1177__inner-left", children: [renderLogo(), !hideRegionPicker && regionPicker && jsx("div", { className: "ids-header-1177__region-picker", children: regionPicker })] }), jsxs("div", { className: "ids-header-1177__inner-right", children: [items, " ", avatar] })] }), jsx("div", { className: "ids-header-1177__right" })] }), children] }) }));
 };
 
 export { IDSHeader1177 };

package/components/header-1177-admin/header-1177-admin-avatar-mobile.d.ts

@@ -3,6 +3,9 @@ import "@inera/ids-design/components/header-1177-admin/header-1177-admin-avatar-
 interface IDSHeader1177AdminAvatarMobileProps {
     username?: string;
     unit?: string;
+    expanded?: boolean;
+    loginLink?: ReactNode;
+    persistent?: boolean;
     children?: ReactNode;
 }
 export declare const IDSHeader1177AdminAvatarMobile: React.FC<IDSHeader1177AdminAvatarMobileProps>;

package/components/header-1177-admin/header-1177-admin-avatar-mobile.js

@@ -1,9 +1,34 @@
 "use client";
-import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
+import { jsxs, jsx } from 'react/jsx-runtime';
+import { useId, useState, useRef, useEffect } from 'react';
 import '@inera/ids-design/components/header-1177-admin/header-1177-admin-avatar-mobile.css';
+import { useHeaderContext } from '../utils/contexts/HeaderContext.js';
+import clsx from 'clsx';
 
-const IDSHeader1177AdminAvatarMobile = ({ username = "", unit = "", children }) => {
-    return (jsx("div", { className: "ids-header-1177-admin__avatar-mobile", children: username || unit ? (jsxs(Fragment, { children: [jsxs("div", { className: "ids-header-1177-admin__avatar-mobile__logged-in", children: [jsx("div", { className: "ids-header-1177-admin__avatar-mobile__username", children: username }), jsx("div", { className: "ids-header-1177-admin__avatar-mobile__unit", children: unit })] }), children] })) : (jsx(Fragment, { children: children })) }));
+const IDSHeader1177AdminAvatarMobile = ({ username = "", unit = "", expanded = false, loginLink, persistent = false, children, ...props }) => {
+    const dropdownId = useId();
+    const [isExpanded, setIsExpanded] = useState(expanded);
+    const headerContext = useHeaderContext();
+    const containerRef = useRef(null);
+    const toggleExpanded = () => setIsExpanded(prev => !prev);
+    const handleClickOutside = (event) => {
+        if (!persistent && containerRef.current && !containerRef.current.contains(event.target)) {
+            setIsExpanded(false);
+        }
+    };
+    useEffect(() => {
+        document.addEventListener("click", handleClickOutside);
+        return () => {
+            document.removeEventListener("click", handleClickOutside);
+        };
+    }, [persistent]);
+    return (!headerContext?.hideRegionPicker && (jsxs("div", { className: clsx("ids-header-1177-admin-avatar-mobile", {
+            "ids-header-1177-admin-avatar-mobile--unresponsive": headerContext?.unresponsive
+        }), ref: containerRef, ...props, children: [!username && loginLink && jsx("span", { className: "ids-header-1177-admin-avatar-mobile__login-link", children: loginLink }), username && (jsxs("div", { className: "ids-header-1177-admin-avatar-mobile__menu-wrapper", children: [jsx("button", { className: clsx("ids-header-1177-admin-avatar-mobile__button", {
+                            "ids-header-1177-admin-avatar-mobile__button--expanded": isExpanded
+                        }), onClick: toggleExpanded, "aria-controls": dropdownId, "aria-expanded": isExpanded, children: jsx("div", { className: "ids-header-1177-admin-avatar-mobile-content__name", title: username, children: username }) }), jsxs("div", { id: dropdownId, className: clsx("ids-header-1177-admin-avatar-mobile__menu", {
+                            "ids-header-1177-admin-avatar-mobile__menu--expanded": isExpanded
+                        }), children: [unit && jsx("div", { className: "ids-header-1177-admin-avatar-mobile__unit", children: unit }), jsx("div", { className: "ids-header-1177-admin-avatar-mobile__menu-links", children: children })] })] }))] })));
 };
 
 export { IDSHeader1177AdminAvatarMobile };

package/components/header-1177-admin/header-1177-admin-avatar.d.ts

@@ -1,10 +1,11 @@
 import React, { ReactNode } from "react";
 import "@inera/ids-design/components/header-1177-admin/header-1177-admin-avatar.css";
 interface IDSHeader1177AdminAvatarProps {
-    username?: string;
+    username: string;
     unit?: string;
-    persistent?: boolean;
+    expanded?: boolean;
     children?: ReactNode;
+    persistent?: boolean;
 }
 export declare const IDSHeader1177AdminAvatar: React.FC<IDSHeader1177AdminAvatarProps>;
 export {};

package/components/header-1177-admin/header-1177-admin-avatar.js

@@ -1,34 +1,47 @@
 "use client";
-import { jsxs, jsx } from 'react/jsx-runtime';
-import { useState, useRef, useEffect } from 'react';
+import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
+import { useId, useState, useRef, useEffect } from 'react';
 import '@inera/ids-design/components/header-1177-admin/header-1177-admin-avatar.css';
 import clsx from 'clsx';
 import { useHeaderContext } from '../utils/contexts/HeaderContext.js';
 
-const IDSHeader1177AdminAvatar = ({ username = "", unit = "", persistent = false, children }) => {
+const IDSHeader1177AdminAvatar = ({ username, unit, expanded = false, children, persistent = false, ...props }) => {
+    const dropdownId = useId();
+    const [isExpanded, setIsExpanded] = useState(expanded);
     const headerContext = useHeaderContext();
-    const [expanded, setExpanded] = useState(false);
-    const avatarRef = useRef(null);
-    const toggleExpanded = () => {
-        setExpanded(prev => !prev);
-    };
+    const containerRef = useRef(null);
+    const dropdownRef = useRef(null);
+    const toggleExpanded = () => setIsExpanded(prev => !prev);
     const handleClickOutside = (event) => {
-        if (!persistent && avatarRef.current && !avatarRef.current.contains(event.target)) {
-            setExpanded(false);
+        if (!persistent && containerRef.current && !containerRef.current.contains(event.target)) {
+            setIsExpanded(false);
         }
     };
     useEffect(() => {
-        document.addEventListener("click", handleClickOutside);
+        document.addEventListener("mousedown", handleClickOutside);
         return () => {
-            document.removeEventListener("click", handleClickOutside);
+            document.removeEventListener("mousedown", handleClickOutside);
         };
     }, [persistent]);
-    return (jsxs("div", { ref: avatarRef, className: clsx("ids-header-1177-admin__avatar", {
-            "ids-header-1177-admin__avatar--unresponsive": headerContext?.unresponsive,
-            "ids-header-1177-admin__avatar--expanded": expanded
-        }), children: [jsxs("button", { onClick: toggleExpanded, "aria-expanded": expanded, className: "ids-header-1177-admin__avatar-box", children: [jsx("div", { className: "ids-header-1177-admin__avatar-icon" }), jsxs("div", { className: "ids-header-1177-admin__avatar-content", children: [jsx("div", { className: "ids-header-1177-admin__avatar-content__name", title: username, children: username }), unit && (jsx("div", { className: "ids-header-1177-admin__avatar-content__unit", title: unit, children: unit }))] }), jsx("div", { className: clsx("ids-header-1177-admin__avatar-chevron", {
-                            "ids-header-1177-admin__avatar-chevron--expanded": expanded
-                        }) })] }), jsx("div", { className: "ids-header-1177-admin__avatar-dropdown", children: children })] }));
+    const handleLinkClick = () => {
+        setIsExpanded(false);
+    };
+    useEffect(() => {
+        if (!persistent && isExpanded) {
+            const links = dropdownRef.current?.querySelectorAll("a") || [];
+            links.forEach(link => link.addEventListener("click", handleLinkClick));
+            return () => {
+                links.forEach(link => link.removeEventListener("click", handleLinkClick));
+            };
+        }
+    }, [isExpanded, persistent]);
+    return (jsx("div", { ref: containerRef, className: clsx("ids-header-1177-admin-avatar", {
+            "ids-header-1177-admin-avatar--unresponsive": headerContext?.unresponsive
+        }), ...props, children: jsxs("div", { className: "ids-header-1177-admin-avatar__menu-wrapper", children: [jsxs("button", { className: clsx("ids-header-1177-admin-avatar__button", {
+                        "ids-header-1177-admin-avatar__button--expanded": isExpanded
+                    }), onClick: toggleExpanded, "aria-controls": dropdownId, "aria-expanded": isExpanded, children: [jsx("div", { className: "ids-header-1177-admin-avatar__name", title: username, children: username }), unit && (jsxs(Fragment, { children: [jsx("span", { className: "ids-header-1177-admin-avatar__unit-separator", children: "|" }), jsx("span", { className: "ids-header-1177-admin-avatar__unit", title: unit, children: unit })] }))] }), jsx("div", { ref: dropdownRef, id: dropdownId, className: clsx("ids-header-1177-admin-avatar__menu", {
+                        "ids-header-1177-admin-avatar__menu--expanded": isExpanded
+                    }), children: children && jsx("div", { className: "ids-header-1177-admin-avatar__menu-links", children: children }) })] }) }));
 };
 
 export { IDSHeader1177AdminAvatar };

package/components/header-1177-admin/header-1177-admin-item.js

@@ -7,12 +7,12 @@ import { useHeaderContext } from '../utils/contexts/HeaderContext.js';
 
 const IDSHeader1177AdminItem = ({ mobile = false, href = "", text = "", icon, link, onClick, ...props }) => {
     const headerContext = useHeaderContext();
-    const classNames = clsx("ids-header-1177-admin__items__item", {
-        "ids-header-1177-admin__items__item--unresponsive": headerContext?.unresponsive,
-        "ids-header-1177-admin__items__item--mobile": mobile
+    const classNames = clsx("ids-header-1177-admin-item", {
+        "ids-header-1177-admin-item--unresponsive": headerContext?.unresponsive,
+        "ids-header-1177-admin-item--mobile": mobile
     });
     const renderContent = () => {
-        return (jsxs(Fragment, { children: [jsx("div", { className: "ids-header-1177-admin__items__item-icon", "aria-label": text, children: jsx("span", { className: `ids-icon-${icon}` }) }), jsx("div", { className: "ids-header-1177-admin__items__item-text", children: text })] }));
+        return (jsxs(Fragment, { children: [jsx("div", { className: "ids-header-1177-admin-item-icon", "aria-hidden": "true", children: jsx("span", { className: `ids-icon-${icon}` }) }), jsx("div", { className: "ids-header-1177-admin-item-text", children: text })] }));
     };
     if (link && isValidElement(link)) {
         return cloneElement(link, {

package/components/header-1177-admin/header-1177-admin-menu-mobile.d.ts

@@ -0,0 +1,11 @@
+import React, { ReactNode } from "react";
+import "@inera/ids-design/components/header-1177-admin/header-1177-admin-menu-mobile.css";
+interface IDSHeader1177AdminMenuMobileProps {
+    srLabel?: string;
+    persistent?: boolean;
+    children?: ReactNode;
+    onExpanded?: () => void;
+    onClosed?: () => void;
+}
+export declare const IDSHeader1177AdminMenuMobile: React.FC<IDSHeader1177AdminMenuMobileProps>;
+export {};

package/components/header-1177-admin/header-1177-admin-menu-mobile.js

@@ -0,0 +1,53 @@
+"use client";
+import { jsxs, jsx } from 'react/jsx-runtime';
+import { useState, useRef, useEffect } from 'react';
+import '@inera/ids-design/components/header-1177-admin/header-1177-admin-menu-mobile.css';
+import { useHeaderContext } from '../utils/contexts/HeaderContext.js';
+import clsx from 'clsx';
+
+const IDSHeader1177AdminMenuMobile = ({ srLabel = "Meny", persistent = false, children, onExpanded, onClosed, ...props }) => {
+    const [isExpanded, setIsExpanded] = useState(false);
+    const headerContext = useHeaderContext();
+    const containerRef = useRef(null);
+    const menuRef = useRef(null);
+    const handleLinkClick = () => {
+        setIsExpanded(false);
+        onClosed?.();
+    };
+    const handleClickOutside = (event) => {
+        if (!persistent && containerRef.current && !containerRef.current.contains(event.target)) {
+            setIsExpanded(false);
+            onClosed?.();
+        }
+    };
+    useEffect(() => {
+        document.addEventListener("click", handleClickOutside);
+        return () => {
+            document.removeEventListener("click", handleClickOutside);
+        };
+    }, [persistent]);
+    useEffect(() => {
+        if (!persistent && isExpanded) {
+            const links = menuRef.current?.querySelectorAll("a") || [];
+            links.forEach(link => link.addEventListener("click", handleLinkClick));
+            return () => {
+                links.forEach(link => link.removeEventListener("click", handleLinkClick));
+            };
+        }
+    }, [isExpanded, persistent]);
+    const toggleExpanded = () => {
+        const newExpanded = !isExpanded;
+        setIsExpanded(newExpanded);
+        if (newExpanded) {
+            onExpanded?.();
+        }
+        else {
+            onClosed?.();
+        }
+    };
+    return (jsxs("div", { className: "ids-header-1177-admin-menu-mobile-component", ref: containerRef, ...props, children: [jsx("button", { onClick: toggleExpanded, "aria-expanded": isExpanded, "aria-label": srLabel, className: clsx("ids-header-1177-admin-menu-mobile", {
+                    "ids-header-1177-admin-menu-mobile--unresponsive": headerContext?.unresponsive
+                }), children: jsx("div", { className: "ids-hamburger", children: jsx("span", { className: "ids-hamburger__lines" }) }) }), isExpanded && (jsx("div", { className: "ids-header-1177-admin-menu-mobile__items", ref: menuRef, children: children }))] }));
+};
+
+export { IDSHeader1177AdminMenuMobile };

package/components/header-1177-admin/header-1177-admin-nav-item.js

@@ -1,11 +1,11 @@
 "use client";
 import { jsxs, jsx } from 'react/jsx-runtime';
-import React__default, { useState, useRef, useEffect } from 'react';
+import React, { useState, useRef, useEffect } from 'react';
 import '@inera/ids-design/components/header-1177-admin/header-1177-admin-nav-item.css';
 import clsx from 'clsx';
 import { useHeaderContext } from '../utils/contexts/HeaderContext.js';
 
-const IDSHeader1177AdminNavItem = ({ active = false, expanded = false, label = "", col1, col2, col3, col4, children }) => {
+const IDSHeader1177AdminNavItem = ({ active = false, expanded = false, label = "", col1, col2, col3, col4, children, ...props }) => {
     const headerContext = useHeaderContext();
     const [isExpanded, setIsExpanded] = useState(expanded);
     const containerRef = useRef(null);
@@ -22,21 +22,20 @@ const IDSHeader1177AdminNavItem = ({ active = false, expanded = false, label = "
         };
     }, [expanded]);
     const renderLink = (link) => {
-        return React__default.isValidElement(link)
-            ? React__default.cloneElement(link, {
+        return React.isValidElement(link)
+            ? React.cloneElement(link, {
                 activeIcon: true,
                 block: true,
-                colorPreset: 1,
+                menu: true,
                 onClick: () => setIsExpanded(false)
             })
             : link;
     };
-    const renderDropdown = () => isExpanded && (jsx("div", { style: { marginTop: "0.125rem" }, id: "ids-header-1177-admin-nav-dropdown", className: "ids-header-1177-admin__items__item-dropdown", children: jsxs("div", { className: "ids-header-1177-admin__items__item-dropdown__content", children: [jsx("div", { className: "ids-header-1177-admin__items__item-dropdown__content-col-1", children: col1?.map((link, idx) => (jsx("div", { className: "ids-header-1177-admin__items-wrapper", children: renderLink(link) }, idx))) }), jsx("div", { className: "ids-header-1177-admin__items__item-dropdown__content-col-2", children: col2?.map((link, idx) => (jsx("div", { className: "ids-header-1177-admin__items-wrapper", children: renderLink(link) }, idx))) }), jsx("div", { className: "ids-header-1177-admin__items__item-dropdown__content-col-3", children: col3?.map((link, idx) => (jsx("div", { className: "ids-header-1177-admin__items-wrapper", children: renderLink(link) }, idx))) }), jsx("div", { className: "ids-header-1177-admin__items__item-dropdown__content-col-4", children: col4?.map((link, idx) => (jsx("div", { className: "ids-header-1177-admin__items-wrapper", children: renderLink(link) }, idx))) })] }) }));
-    return (jsxs("div", { ref: containerRef, className: clsx("ids-header-1177-admin__nav-item", {
-            "ids-header-1177-admin__nav-item--fluid": headerContext?.fluid,
-            "ids-header-1177-admin__nav-item--unresponsive": headerContext?.unresponsive,
-            "ids-header-1177-admin__nav-item--active": active || isExpanded
-        }), children: [label ? (jsx("button", { onClick: () => setIsExpanded(prev => !prev), "aria-expanded": isExpanded, "aria-controls": "ids-header-1177-admin-nav-dropdown", children: label })) : (children), renderDropdown()] }));
+    const renderDropdown = () => isExpanded && (jsx("div", { id: "ids-header-1177-admin-nav-dropdown", className: "ids-header-1177-admin-nav-item__menu ids-header-1177-admin-nav-item__menu--expanded", children: jsxs("div", { className: "ids-header-1177-admin-nav-item__menu__content", children: [jsx("div", { className: "ids-header-1177-admin-nav-item__menu__content-col-1", children: col1?.map((link, idx) => (jsx("div", { className: "ids-header-1177-admin-nav__menu-item-wrapper", children: renderLink(link) }, idx))) }), jsx("div", { className: "ids-header-1177-admin-nav-item__menu__content-col-2", children: col2?.map((link, idx) => (jsx("div", { className: "ids-header-1177-admin-nav__menu-item-wrapper", children: renderLink(link) }, idx))) }), jsx("div", { className: "ids-header-1177-admin-nav-item__menu__content-col-3", children: col3?.map((link, idx) => (jsx("div", { className: "ids-header-1177-admin-nav__menu-item-wrapper", children: renderLink(link) }, idx))) }), jsx("div", { className: "ids-header-1177-admin-nav-item__menu__content-col-4", children: col4?.map((link, idx) => (jsx("div", { className: "ids-header-1177-admin-nav__menu-item-wrapper", children: renderLink(link) }, idx))) })] }) }));
+    return (jsxs("div", { ref: containerRef, className: clsx("ids-header-1177-admin-nav-item", {
+            "ids-header-1177-admin-nav-item--unresponsive": headerContext?.unresponsive,
+            "ids-header-1177-admin-nav-item--active": active || isExpanded
+        }), ...props, children: [label ? (jsx("button", { onClick: () => setIsExpanded(prev => !prev), "aria-expanded": isExpanded, "aria-controls": "ids-header-1177-admin-nav-dropdown", children: label })) : (children), renderDropdown()] }));
 };
 
 export { IDSHeader1177AdminNavItem };

package/components/header-1177-admin/header-1177-admin-nav.js

@@ -4,12 +4,11 @@ import '@inera/ids-design/components/header-1177-admin/header-1177-admin-nav.css
 import clsx from 'clsx';
 import { useHeaderContext } from '../utils/contexts/HeaderContext.js';
 
-const IDSHeader1177AdminNav = ({ children }) => {
+const IDSHeader1177AdminNav = ({ children, ...props }) => {
     const headerContext = useHeaderContext();
-    return (jsx("nav", { className: clsx("ids-header-1177-admin__nav", {
-            "ids-header-1177-admin__nav--fluid": headerContext?.fluid,
-            "ids-header-1177-admin__nav--unresponsive": headerContext?.unresponsive
-        }), children: jsx("div", { className: "ids-header-1177-admin__nav-inner", children: children }) }));
+    return (jsx("nav", { className: clsx("ids-header-1177-admin-nav", {
+            "ids-header-1177-admin-nav--unresponsive": headerContext?.unresponsive
+        }), ...props, children: jsx("div", { className: "ids-header-1177-admin-nav__inner", children: jsx("div", { className: "ids-header-1177-admin-nav__items", children: children }) }) }));
 };
 
 export { IDSHeader1177AdminNav };

package/components/header-1177-admin/header-1177-admin.d.ts

@@ -1,16 +1,13 @@
 import React, { AnchorHTMLAttributes, ReactNode } from "react";
 import "@inera/ids-design/components/header-1177-admin/header-1177-admin.css";
 interface IDSHeader1177AdminProps extends React.HTMLAttributes<HTMLDivElement> {
-    fluid?: boolean;
     unresponsive?: boolean;
-    srLogoLabel?: string;
+    srLogoText?: string;
     brandTextTop?: string;
     brandText?: string;
     brandTextBottom?: string;
     logoHref?: string;
     logoProps?: AnchorHTMLAttributes<HTMLAnchorElement>;
-    srMobileMenuLabel?: string;
-    mobileMenuExpanded?: boolean;
     logo?: ReactNode;
     avatar?: ReactNode;
     mobileMenu?: ReactNode;

package/components/header-1177-admin/header-1177-admin.js

@@ -1,29 +1,16 @@
 "use client";
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { useState } from 'react';
 import '@inera/ids-design/components/header-1177-admin/header-1177-admin.css';
 import clsx from 'clsx';
 import { HeaderProvider } from '../utils/contexts/HeaderContext.js';
 
-const IDSHeader1177Admin = ({ fluid = false, unresponsive = false, srLogoLabel = "Logotyp", brandTextTop = "", brandText = "", brandTextBottom = "", logoHref = "", logoProps = {}, srMobileMenuLabel = "Meny", mobileMenuExpanded: initialExpanded = false, logo, avatar, mobileMenu, items, skipToContentLink, className, children }) => {
-    const [mobileExpanded, setMobileExpanded] = useState(initialExpanded);
+const IDSHeader1177Admin = ({ unresponsive = false, srLogoText = "Logotyp", brandTextTop = "", brandText = "", brandTextBottom = "", logoHref = "", logoProps = {}, logo, avatar, mobileMenu, items, skipToContentLink, className, children, ...props }) => {
     const renderLogo = () => {
-        return logo ? (logo) : (jsx("a", { className: "ids-header-1177-admin__logo-link", href: logoHref, "aria-label": srLogoLabel, ...logoProps }));
+        return logo ? (logo) : (jsx("a", { className: "ids-header-1177-admin__logo-link", href: logoHref, "aria-label": srLogoText, ...logoProps }));
     };
-    const renderHamburgerButton = () => {
-        if (!mobileMenu)
-            return null;
-        return (jsx("div", { className: "ids-header-1177-admin__mobile-menu", children: jsx("button", { onClick: () => setMobileExpanded(prev => !prev), "aria-label": srMobileMenuLabel, "aria-expanded": mobileExpanded, className: "ids-header-1177-admin__mobile-menu__btn", children: jsx("div", { className: "ids-hamburger", children: jsx("div", { className: "ids-hamburger__lines" }) }) }) }));
-    };
-    const renderMobileMenuItems = () => {
-        if (!mobileExpanded || !mobileMenu)
-            return null;
-        return jsx("div", { className: "ids-header-1177-admin__nav-mobile__menu-items", children: mobileMenu });
-    };
-    return (jsx(HeaderProvider, { value: { unresponsive, fluid }, children: jsxs("header", { className: clsx("ids-header-1177-admin", {
-                "ids-header-1177-admin--unresponsive": unresponsive,
-                "ids-header-1177-admin--fluid": fluid
-            }, className), style: { position: "relative", zIndex: 3 }, children: [jsxs("div", { className: "ids-header-1177-admin__container", children: [skipToContentLink && (jsx("div", { className: "ids-header-1177-admin__skip-to-content", children: skipToContentLink })), jsxs("div", { className: "ids-header-1177-admin__inner", children: [jsxs("div", { className: "ids-header-1177-admin__logo-col", children: [jsx("div", { className: "ids-header-1177-admin__logo", children: renderLogo() }), jsxs("div", { className: "ids-header-1177-admin__brand", children: [brandTextTop && (jsx("div", { className: "ids-header-1177-admin__brand-text---supplement", children: brandTextTop })), brandText && jsx("div", { className: "ids-header-1177-admin__brand-text", children: brandText }), brandTextBottom && (jsx("div", { className: "ids-header-1177-admin__brand-text---supplement", children: brandTextBottom }))] })] }), jsx("div", { className: "ids-header-1177-admin__items", children: jsxs("div", { className: "ids-header-1177-admin__items-inner", children: [avatar, items, renderHamburgerButton()] }) })] })] }), renderMobileMenuItems(), children] }) }));
+    return (jsx(HeaderProvider, { value: { unresponsive }, children: jsxs("header", { className: clsx("ids-header-1177-admin", {
+                "ids-header-1177-admin--unresponsive": unresponsive
+            }, className), style: { position: "relative", zIndex: 3 }, ...props, children: [skipToContentLink && jsx("div", { className: "ids-header-1177-admin__skip-to-content", children: skipToContentLink }), jsxs("div", { className: "ids-header-1177-admin__main", children: [jsxs("div", { className: "ids-header-1177-admin__main-left", children: [jsx("div", { className: "ids-header-1177-admin__logo", children: renderLogo() }), jsxs("div", { className: "ids-header-1177-admin__brand", children: [brandTextTop && jsx("div", { className: "ids-header-1177-admin__brand-text---supplement", children: brandTextTop }), brandText && jsx("div", { className: "ids-header-1177-admin__brand-text", children: brandText }), brandTextBottom && jsx("div", { className: "ids-header-1177-admin__brand-text---supplement", children: brandTextBottom })] })] }), jsxs("div", { className: "ids-header-1177-admin__main-right", children: [items, avatar, mobileMenu] })] }), children] }) }));
 };
 
 export { IDSHeader1177Admin };

package/components/header-1177-pro/header-1177-pro-avatar-mobile.d.ts

@@ -3,6 +3,9 @@ import "@inera/ids-design/components/header-1177-pro/header-1177-pro-avatar-mobi
 interface IDSHeader1177ProAvatarMobileProps {
     username?: string;
     unit?: string;
+    expanded?: boolean;
+    loginLink?: ReactNode;
+    persistent?: boolean;
     children?: ReactNode;
 }
 export declare const IDSHeader1177ProAvatarMobile: React.FC<IDSHeader1177ProAvatarMobileProps>;

package/components/header-1177-pro/header-1177-pro-avatar-mobile.js

@@ -1,9 +1,34 @@
 "use client";
-import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
+import { jsxs, jsx } from 'react/jsx-runtime';
+import { useId, useState, useRef, useEffect } from 'react';
 import '@inera/ids-design/components/header-1177-pro/header-1177-pro-avatar-mobile.css';
+import { useHeaderContext } from '../utils/contexts/HeaderContext.js';
+import clsx from 'clsx';
 
-const IDSHeader1177ProAvatarMobile = ({ username = "", unit = "", children }) => {
-    return (jsx("li", { className: "ids-header-1177-pro__avatar-mobile", children: username || unit ? (jsxs(Fragment, { children: [jsxs("div", { className: "ids-header-1177-pro__avatar-mobile__user-logged-in", children: [jsx("div", { className: "ids-header-1177-pro__avatar-mobile__username", children: username }), unit && jsx("div", { className: "ids-header-1177-pro__avatar-mobile__unit", children: unit })] }), children] })) : (jsx(Fragment, { children: children })) }));
+const IDSHeader1177ProAvatarMobile = ({ username = "", unit = "", expanded = false, loginLink, persistent = false, children, ...props }) => {
+    const dropdownId = useId();
+    const [isExpanded, setIsExpanded] = useState(expanded);
+    const headerContext = useHeaderContext();
+    const containerRef = useRef(null);
+    const toggleExpanded = () => setIsExpanded(prev => !prev);
+    const handleClickOutside = (event) => {
+        if (!persistent && containerRef.current && !containerRef.current.contains(event.target)) {
+            setIsExpanded(false);
+        }
+    };
+    useEffect(() => {
+        document.addEventListener("click", handleClickOutside);
+        return () => {
+            document.removeEventListener("click", handleClickOutside);
+        };
+    }, [persistent]);
+    return (!headerContext?.hideRegionPicker && (jsxs("div", { className: clsx("ids-header-1177-pro-avatar-mobile", {
+            "ids-header-1177-pro-avatar-mobile--unresponsive": headerContext?.unresponsive
+        }), ref: containerRef, ...props, children: [!username && loginLink && jsx("span", { className: "ids-header-1177-pro-avatar-mobile__login-link", children: loginLink }), username && (jsxs("div", { className: "ids-header-1177-pro-avatar-mobile__menu-wrapper", children: [jsx("button", { className: clsx("ids-header-1177-pro-avatar-mobile__button", {
+                            "ids-header-1177-pro-avatar-mobile__button--expanded": isExpanded
+                        }), onClick: toggleExpanded, "aria-controls": dropdownId, "aria-expanded": isExpanded, children: jsx("div", { className: "ids-header-1177-pro-avatar-mobile-content__name", title: username, children: username }) }), jsxs("div", { id: dropdownId, className: clsx("ids-header-1177-pro-avatar-mobile__menu", {
+                            "ids-header-1177-pro-avatar-mobile__menu--expanded": isExpanded
+                        }), children: [unit && jsx("div", { className: "ids-header-1177-pro-avatar-mobile__unit", children: unit }), jsx("div", { className: "ids-header-1177-pro-avatar-mobile__menu-links", children: children })] })] }))] })));
 };
 
 export { IDSHeader1177ProAvatarMobile };

package/components/header-1177-pro/header-1177-pro-avatar.d.ts

@@ -1,10 +1,11 @@
 import React, { ReactNode } from "react";
 import "@inera/ids-design/components/header-1177-pro/header-1177-pro-avatar.css";
 interface IDSHeader1177ProAvatarProps {
-    username?: string;
+    username: string;
     unit?: string;
-    persistent?: boolean;
+    expanded?: boolean;
     children?: ReactNode;
+    persistent?: boolean;
 }
 export declare const IDSHeader1177ProAvatar: React.FC<IDSHeader1177ProAvatarProps>;
 export {};

package/components/header-1177-pro/header-1177-pro-avatar.js

@@ -1,34 +1,47 @@
 "use client";
-import { jsxs, jsx } from 'react/jsx-runtime';
-import { useState, useRef, useEffect } from 'react';
+import { jsx, jsxs } from 'react/jsx-runtime';
+import { useId, useState, useRef, useEffect } from 'react';
 import '@inera/ids-design/components/header-1177-pro/header-1177-pro-avatar.css';
 import clsx from 'clsx';
 import { useHeaderContext } from '../utils/contexts/HeaderContext.js';
 
-const IDSHeader1177ProAvatar = ({ username = "", unit = "", persistent = false, children }) => {
+const IDSHeader1177ProAvatar = ({ username, unit, expanded = false, children, persistent = false, ...props }) => {
+    const dropdownId = useId();
+    const [isExpanded, setIsExpanded] = useState(expanded);
     const headerContext = useHeaderContext();
-    const [expanded, setExpanded] = useState(false);
-    const avatarRef = useRef(null);
-    const toggleExpanded = () => {
-        setExpanded(prev => !prev);
+    const containerRef = useRef(null);
+    const dropdownRef = useRef(null);
+    const toggleExpanded = () => setIsExpanded(prev => !prev);
+    const handleClickOutside = (event) => {
+        if (!persistent && containerRef.current && !containerRef.current.contains(event.target)) {
+            setIsExpanded(false);
+        }
     };
     useEffect(() => {
-        const handleClickOutside = (event) => {
-            if (avatarRef.current && !avatarRef.current.contains(event.target) && !persistent) {
-                setExpanded(false);
-            }
-        };
         document.addEventListener("mousedown", handleClickOutside);
         return () => {
             document.removeEventListener("mousedown", handleClickOutside);
         };
     }, [persistent]);
-    return (jsxs("div", { ref: avatarRef, className: clsx("ids-header-1177-pro__avatar", {
-            "ids-header-1177-pro__avatar--unresponsive": headerContext?.unresponsive,
-            "ids-header-1177-pro__avatar--expanded": expanded
-        }), children: [jsxs("button", { onClick: toggleExpanded, "aria-controls": "ids-header-1177-pro__dropdown", "aria-expanded": expanded, className: "ids-header-1177-pro__avatar-box", children: [jsx("div", { className: "ids-header-1177-pro__avatar-icon" }), jsxs("div", { className: "ids-header-1177-pro__avatar-content", children: [jsx("div", { className: "ids-header-1177-pro__avatar-content__name", title: username, children: username }), jsx("div", { className: "ids-header-1177-pro__avatar-content__unit", title: unit, children: unit })] }), jsx("div", { className: clsx("ids-header-1177-pro__avatar-chevron", {
-                            "ids-header-1177-pro__avatar-chevron--expanded": expanded
-                        }) })] }), jsx("div", { id: "ids-header-1177-pro__dropdown", className: "ids-header-1177-pro__avatar-dropdown", children: children })] }));
+    const handleLinkClick = () => {
+        setIsExpanded(false);
+    };
+    useEffect(() => {
+        if (!persistent && isExpanded) {
+            const links = dropdownRef.current?.querySelectorAll("a") || [];
+            links.forEach(link => link.addEventListener("click", handleLinkClick));
+            return () => {
+                links.forEach(link => link.removeEventListener("click", handleLinkClick));
+            };
+        }
+    }, [isExpanded, persistent]);
+    return (jsx("div", { ref: containerRef, className: clsx("ids-header-1177-pro-avatar", {
+            "ids-header-1177-pro-avatar--unresponsive": headerContext?.unresponsive
+        }), ...props, children: jsxs("div", { className: "ids-header-1177-pro-avatar__menu-wrapper", children: [jsxs("button", { className: clsx("ids-header-1177-pro-avatar__button", {
+                        "ids-header-1177-pro-avatar__button--expanded": isExpanded
+                    }), onClick: toggleExpanded, "aria-controls": dropdownId, "aria-expanded": isExpanded, children: [jsx("div", { className: "ids-header-1177-pro-avatar__name", title: username, children: username }), unit && (jsx("div", { className: "ids-header-1177-pro-avatar__unit", title: unit, children: unit }))] }), jsx("div", { ref: dropdownRef, id: dropdownId, className: clsx("ids-header-1177-pro-avatar__menu", {
+                        "ids-header-1177-pro-avatar__menu--expanded": isExpanded
+                    }), children: children && jsx("div", { className: "ids-header-1177-pro-avatar__menu-links", children: children }) })] }) }));
 };
 
 export { IDSHeader1177ProAvatar };

package/components/header-1177-pro/header-1177-pro-item.js

@@ -7,11 +7,11 @@ import { useHeaderContext } from '../utils/contexts/HeaderContext.js';
 
 const IDSHeader1177ProItem = ({ mobile = false, icon = "", text = "", href = "", link, onClick, ...props }) => {
     const headerContext = useHeaderContext();
-    const classNames = clsx("ids-header-1177-pro__items__item", {
-        "ids-header-1177-pro__items__item--unresponsive": headerContext?.unresponsive,
-        "ids-header-1177-pro__items__item--mobile": mobile
+    const classNames = clsx("ids-header-1177-pro-item", {
+        "ids-header-1177-pro-item--unresponsive": headerContext?.unresponsive,
+        "ids-header-1177-pro-item--mobile": mobile
     });
-    const renderContent = () => (jsxs(Fragment, { children: [jsx("div", { className: "ids-header-1177-pro__items__item-icon", "aria-label": text, children: icon && jsx("span", { className: `ids-icon-${icon}` }) }), jsx("div", { className: "ids-header-1177-pro__items__item-text", children: text })] }));
+    const renderContent = () => (jsxs(Fragment, { children: [jsx("div", { className: "ids-header-1177-pro-item-icon", "aria-hidden": "true", children: icon && jsx("span", { className: `ids-icon-${icon}` }) }), jsx("div", { className: "ids-header-1177-pro-item-text", children: text })] }));
     if (link && isValidElement(link)) {
         return cloneElement(link, {
             ...props,
@@ -20,7 +20,7 @@ const IDSHeader1177ProItem = ({ mobile = false, icon = "", text = "", href = "",
             children: renderContent()
         });
     }
-    return onClick ? (jsx("button", { className: classNames, onClick: onClick, style: { cursor: "pointer", padding: 0, margin: 0 }, ...props, children: renderContent() })) : (jsx("a", { className: classNames, href: href, style: { position: "relative", textDecoration: "none" }, ...props, children: renderContent() }));
+    return onClick ? (jsx("button", { className: classNames, onClick: onClick, style: { cursor: "pointer", padding: 0 }, ...props, children: renderContent() })) : (jsx("a", { className: classNames, href: href, style: { position: "relative", textDecoration: "none" }, ...props, children: renderContent() }));
 };
 
 export { IDSHeader1177ProItem };

package/components/header-1177-pro/{header-1177-pro-nav-menu-mobile.d.ts → header-1177-pro-menu-mobile.d.ts}

@@ -1,11 +1,11 @@
 import React, { ReactNode } from "react";
-import "@inera/ids-design/components/header-1177-pro/header-1177-pro-nav-menu-mobile.css";
-interface IDSHeader1177ProNavMenuMobileProps {
+import "@inera/ids-design/components/header-1177-pro/header-1177-pro-menu-mobile.css";
+interface IDSHeader1177ProMenuMobileProps {
     label?: string;
     persistent?: boolean;
     children?: ReactNode;
     onExpanded?: () => void;
     onClosed?: () => void;
 }
-export declare const IDSHeader1177ProNavMenuMobile: React.FC<IDSHeader1177ProNavMenuMobileProps>;
+export declare const IDSHeader1177ProMenuMobile: React.FC<IDSHeader1177ProMenuMobileProps>;
 export {};