@inera/ids-react 8.0.0 → 8.1.0

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

@@ -1,14 +1,17 @@
 "use client";
 import { jsxs, jsx } from 'react/jsx-runtime';
-import React, { useState, useRef, useEffect } from 'react';
+import { useState, useRef, useEffect } from 'react';
 import '@inera/ids-design/components/header-1177/header-1177-nav-item.css';
 import clsx from 'clsx';
 import { useHeaderContext } from '../utils/contexts/HeaderContext.js';
+import { useElementId } from '../utils/hooks/useElementId.js';
 
-const IDSHeader1177NavItem = ({ active = false, expanded = false, label = "", col1, col2, col3, col4, children, ...props }) => {
-    const [isExpanded, setIsExpanded] = useState(expanded);
+const IDSHeader1177NavItem = ({ label = "", active = false, expanded = false, notification, children, col1, col2, col3, col4, ...props }) => {
     const headerContext = useHeaderContext();
+    const [isExpanded, setIsExpanded] = useState(expanded);
     const containerRef = useRef(null);
+    const contentId = useElementId();
+    //FIXME click on link should also close menu
     const handleClickOutside = (event) => {
         if (containerRef.current && !containerRef.current.contains(event.target)) {
             setIsExpanded(false);
@@ -21,21 +24,24 @@ const IDSHeader1177NavItem = ({ active = false, expanded = false, label = "", co
             document.removeEventListener("click", handleClickOutside);
         };
     }, [expanded]);
-    const renderLink = (link) => {
-        return React.isValidElement(link)
-            ? React.cloneElement(link, {
-                activeIcon: true,
-                block: true,
-                colorPreset: 2,
-                onClick: () => setIsExpanded(false)
-            })
-            : link;
+    const renderNavItem = () => {
+        if (label) {
+            return (jsxs("button", { "aria-controls": contentId, "aria-expanded": isExpanded, className: "ids-header-1177-nav-item__button", onClick: () => setIsExpanded(prev => !prev), children: [label, " ", notification] }));
+        }
+        else {
+            return (jsxs("span", { className: "ids-header-1177-nav-item__link", children: [children, " ", notification] }));
+        }
+    };
+    const renderContent = () => {
+        if (!isExpanded)
+            return null;
+        return (jsx("div", { id: contentId, className: "ids-header-1177-nav-item__menu ids-header-1177-nav-item__menu--expanded", children: jsxs("div", { className: "ids-header-1177-nav-item__menu-content", children: [jsx("div", { className: "ids-header-1177-nav-item__menu-col-1", children: col1?.map((link, idx) => (jsx("div", { className: "ids-header-1177-nav__menu-item-wrapper", children: link }, idx))) }), jsx("div", { className: "ids-header-1177-nav-item__menu-col-2", children: col2?.map((link, idx) => (jsx("div", { className: "ids-header-1177-nav__menu-item-wrapper", children: link }, idx))) }), jsx("div", { className: "ids-header-1177-nav-item__menu-col-3", children: col3?.map((link, idx) => (jsx("div", { className: "ids-header-1177-nav__menu-item-wrapper", children: link }, idx))) }), jsx("div", { className: "ids-header-1177-nav-item__menu-col-4", children: col4 })] }) }));
     };
-    const renderDropdown = () => isExpanded && (jsx("div", { id: "ids-header-1177-nav-dropdown", className: "ids-header-1177-nav-item__menu ids-header-1177-nav-item__menu--expanded", children: jsxs("div", { className: "ids-header-1177-nav-item__menu__content", children: [jsx("div", { className: "ids-header-1177-nav-item__menu__content-col-1", children: col1?.map((link, idx) => (jsx("div", { className: "ids-header-1177-nav__menu-item-wrapper", children: renderLink(link) }, idx))) }), jsx("div", { className: "ids-header-1177-nav-item__menu__content-col-2", children: col2?.map((link, idx) => (jsx("div", { className: "ids-header-1177-nav__menu-item-wrapper", children: renderLink(link) }, idx))) }), jsx("div", { className: "ids-header-1177-nav-item__menu__content-col-3", children: col3?.map((link, idx) => (jsx("div", { className: "ids-header-1177-nav__menu-item-wrapper", children: renderLink(link) }, idx))) }), jsx("div", { className: "ids-header-1177-nav-item__menu__content-col-4", children: col4 })] }) }));
-    return (jsxs("div", { ref: containerRef, className: clsx("ids-header-1177__nav-item", {
-            "ids-header-1177__nav-item--unresponsive": headerContext?.unresponsive,
-            "ids-header-1177__nav-item--active": active || isExpanded
-        }), ...props, children: [label ? (jsx("button", { onClick: () => setIsExpanded(prev => !prev), "aria-expanded": isExpanded, "aria-controls": "ids-header-1177-nav-dropdown", children: label })) : (children), renderDropdown()] }));
+    return (jsxs("div", { ref: containerRef, className: clsx("ids-header-1177-nav-item", {
+            "ids-header-1177-nav-item--unresponsive": headerContext?.unresponsive,
+            "ids-header-1177-nav-item--expanded": isExpanded,
+            "ids-header-1177-nav-item--active": active
+        }), ...props, children: [renderNavItem(), renderContent()] }));
 };
 
 export { IDSHeader1177NavItem };

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

@@ -1,4 +1,4 @@
-import React, { ReactNode } from "react";
+import { ReactNode } from "react";
 import "@inera/ids-design/components/header-1177/header-1177-nav.css";
 interface IDSHeader1177NavProps {
     hideOnTablet?: boolean;
@@ -6,5 +6,5 @@ interface IDSHeader1177NavProps {
     mobileRight?: ReactNode;
     children?: ReactNode;
 }
-export declare const IDSHeader1177Nav: React.FC<IDSHeader1177NavProps>;
+export declare function IDSHeader1177Nav({ hideOnTablet, mobileLeft, mobileRight, children, ...props }: IDSHeader1177NavProps): import("react/jsx-runtime").JSX.Element;
 export {};

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

@@ -1,16 +1,15 @@
-"use client";
 import { jsxs, jsx } from 'react/jsx-runtime';
 import '@inera/ids-design/components/header-1177/header-1177-nav.css';
 import clsx from 'clsx';
 import { useHeaderContext } from '../utils/contexts/HeaderContext.js';
 
-const IDSHeader1177Nav = ({ hideOnTablet = false, mobileLeft, mobileRight, children, ...props }) => {
-    const headerContext = useHeaderContext();
+function IDSHeader1177Nav({ hideOnTablet = false, mobileLeft, mobileRight, children, ...props }) {
+    const headerContext = useHeaderContext() || { unresponsive: false };
     const navClass = clsx("ids-header-1177__nav", {
-        "ids-header-1177__nav--unresponsive": headerContext?.unresponsive,
+        "ids-header-1177__nav--unresponsive": headerContext.unresponsive,
         "ids-header-1177__nav--hide-on-tablet": hideOnTablet
     });
     return (jsxs("nav", { className: navClass, ...props, children: [jsx("div", { className: "ids-header-1177__nav-inner", children: jsx("div", { className: "ids-header-1177__nav-content", children: children }) }), jsxs("div", { className: "ids-header-1177__nav-inner-mobile", children: [jsx("div", { className: "ids-header-1177__nav-inner-mobile-left", children: mobileLeft }), jsx("div", { className: "ids-header-1177__nav-inner-mobile-right", children: mobileRight })] })] }));
-};
+}
 
 export { IDSHeader1177Nav };

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

@@ -14,5 +14,5 @@ interface IDSHeader1177Props extends React.HTMLAttributes<HTMLDivElement> {
     avatar?: ReactNode;
     children?: ReactNode;
 }
-export declare const IDSHeader1177: React.FC<IDSHeader1177Props>;
+export declare function IDSHeader1177({ srLogoText, hideRegionPicker, unresponsive, logoHref, logoProps, logo, regionPicker, skipToContentLink, items, avatar, className, children, ...props }: IDSHeader1177Props): import("react/jsx-runtime").JSX.Element;
 export {};

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

@@ -1,28 +1,15 @@
-"use client";
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { useState, useRef, useEffect } from 'react';
 import clsx from 'clsx';
-import '@inera/ids-design/components/header-1177/header-1177.css';
 import { HeaderProvider } from '../utils/contexts/HeaderContext.js';
+import '@inera/ids-design/components/header-1177/header-1177.css';
 
-const IDSHeader1177 = ({ srLogoText = "Logotyp", hideRegionPicker: initialRegionPicker = false, unresponsive = false, logoHref = "", logoProps = {}, logo, regionPicker, skipToContentLink, items, avatar, className, children, ...props }) => {
-    const [hideRegionPicker, setHideRegionPicker] = useState(initialRegionPicker);
-    useRef(null);
-    useEffect(() => {
-        if (avatar) {
-            // No region picker when avatar
-            setHideRegionPicker(true);
-        }
-        else {
-            setHideRegionPicker(initialRegionPicker);
-        }
-    }, [avatar]);
+function IDSHeader1177({ srLogoText = "Logotyp", hideRegionPicker = false, unresponsive = false, logoHref = "", logoProps = {}, logo, regionPicker, skipToContentLink, items, avatar, className, children, ...props }) {
     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": srLogoText, ...logoProps })) }) }));
     };
     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-item.d.ts

@@ -1,4 +1,4 @@
-import React, { ReactNode } from "react";
+import { ReactNode } from "react";
 import "@inera/ids-design/components/header-1177-admin/header-1177-admin-item.css";
 interface IDSHeader1177AdminItemProps {
     mobile?: boolean;
@@ -8,5 +8,5 @@ interface IDSHeader1177AdminItemProps {
     link?: ReactNode;
     onClick?: () => void;
 }
-export declare const IDSHeader1177AdminItem: React.FC<IDSHeader1177AdminItemProps>;
+export declare function IDSHeader1177AdminItem({ mobile, href, text, icon, link, onClick, ...props }: IDSHeader1177AdminItemProps): import("react/jsx-runtime").JSX.Element;
 export {};

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

@@ -1,29 +1,33 @@
-"use client";
-import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { isValidElement, cloneElement } from 'react';
-import '@inera/ids-design/components/header-1177-admin/header-1177-admin-item.css';
+import { jsxs, jsx } from 'react/jsx-runtime';
+import React, { isValidElement, cloneElement } from 'react';
 import clsx from 'clsx';
 import { useHeaderContext } from '../utils/contexts/HeaderContext.js';
+import '@inera/ids-design/components/header-1177-admin/header-1177-admin-item.css';
 
-const IDSHeader1177AdminItem = ({ mobile = false, href = "", text = "", icon, link, onClick, ...props }) => {
-    const headerContext = useHeaderContext();
+function IDSHeader1177AdminItem({ mobile = false, href = "", text = "", icon, link, onClick, ...props }) {
+    const headerContext = useHeaderContext() || { unresponsive: false };
     const classNames = clsx("ids-header-1177-admin-item", {
-        "ids-header-1177-admin-item--unresponsive": headerContext?.unresponsive,
+        "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-item-icon", "aria-hidden": "true", children: jsx("span", { className: `ids-icon-${icon}` }) }), jsx("div", { className: "ids-header-1177-admin-item-text", children: text })] }));
-    };
+    const renderContent = () => (jsx("div", { className: "ids-header-1177-admin-item-icon", "aria-hidden": "true", children: jsx("span", { className: `ids-icon-${icon}` }) }));
     if (link && isValidElement(link)) {
-        return cloneElement(link, {
+        const linkProps = link.props;
+        const hasChildren = !!linkProps.children &&
+            (typeof linkProps.children === "string"
+                ? linkProps.children.trim().length > 0
+                : React.Children.count(linkProps.children) > 0);
+        const newLink = cloneElement(link, {
             ...props,
-            className: clsx(link.props.className, classNames),
-            children: renderContent()
+            className: clsx(linkProps.className),
+            children: hasChildren ? linkProps.children : text
         });
+        return (jsxs("div", { className: classNames, children: [renderContent(), " ", newLink] }));
+    }
+    if (onClick) {
+        return (jsxs("div", { className: classNames, children: [renderContent(), jsx("button", { onClick: onClick, ...props, children: text })] }));
     }
-    return onClick ? (jsx("button", { className: classNames, onClick: onClick, style: {
-            cursor: "pointer"
-        }, ...props, children: renderContent() })) : (jsx("a", { className: classNames, href: href, ...props, children: renderContent() }));
-};
+    return (jsxs("div", { className: classNames, children: [renderContent(), jsx("a", { href: href, ...props, children: text })] }));
+}
 
 export { IDSHeader1177AdminItem };

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

@@ -1,15 +1,15 @@
 import React, { ReactNode, ReactElement } from "react";
 import "@inera/ids-design/components/header-1177-admin/header-1177-admin-nav-item.css";
 import { IDSLinkProps } from "../link/link";
-interface IDSHeader1177AdminNavItemProps {
+export interface IDSHeader1177AdminNavItemProps {
+    label?: string;
     active?: boolean;
     expanded?: boolean;
-    label?: string;
+    notification?: ReactNode;
+    children?: ReactNode;
     col1?: ReactElement<IDSLinkProps>[];
     col2?: ReactElement<IDSLinkProps>[];
     col3?: ReactElement<IDSLinkProps>[];
     col4?: ReactElement<IDSLinkProps>[];
-    children?: ReactNode;
 }
 export declare const IDSHeader1177AdminNavItem: React.FC<IDSHeader1177AdminNavItemProps>;
-export {};

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

@@ -1,14 +1,17 @@
 "use client";
 import { jsxs, jsx } from 'react/jsx-runtime';
-import React, { useState, useRef, useEffect } from 'react';
+import { 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';
+import { useElementId } from '../utils/hooks/useElementId.js';
 
-const IDSHeader1177AdminNavItem = ({ active = false, expanded = false, label = "", col1, col2, col3, col4, children, ...props }) => {
+const IDSHeader1177AdminNavItem = ({ label = "", active = false, expanded = false, notification, children, col1, col2, col3, col4, ...props }) => {
     const headerContext = useHeaderContext();
     const [isExpanded, setIsExpanded] = useState(expanded);
     const containerRef = useRef(null);
+    const contentId = useElementId();
+    //FIXME click on link should also close menu
     const handleClickOutside = (event) => {
         if (containerRef.current && !containerRef.current.contains(event.target)) {
             setIsExpanded(false);
@@ -21,21 +24,24 @@ const IDSHeader1177AdminNavItem = ({ active = false, expanded = false, label = "
             document.removeEventListener("click", handleClickOutside);
         };
     }, [expanded]);
-    const renderLink = (link) => {
-        return React.isValidElement(link)
-            ? React.cloneElement(link, {
-                activeIcon: true,
-                block: true,
-                menu: true,
-                onClick: () => setIsExpanded(false)
-            })
-            : link;
+    const renderNavItem = () => {
+        if (label) {
+            return (jsxs("button", { "aria-controls": contentId, "aria-expanded": isExpanded, className: "ids-header-1177-admin-nav-item__button", onClick: () => setIsExpanded(prev => !prev), children: [label, " ", notification] }));
+        }
+        else {
+            return (jsxs("span", { className: "ids-header-1177-admin-nav-item__link", children: [children, " ", notification] }));
+        }
+    };
+    const renderContent = () => {
+        if (!isExpanded)
+            return null;
+        return (jsx("div", { id: contentId, 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-col-1", children: col1?.map((link, idx) => (jsx("div", { className: "ids-header-1177-admin-nav__menu-item-wrapper", children: link }, idx))) }), jsx("div", { className: "ids-header-1177-admin-nav-item__menu-col-2", children: col2?.map((link, idx) => (jsx("div", { className: "ids-header-1177-admin-nav__menu-item-wrapper", children: link }, idx))) }), jsx("div", { className: "ids-header-1177-admin-nav-item__menu-col-3", children: col3?.map((link, idx) => (jsx("div", { className: "ids-header-1177-admin-nav__menu-item-wrapper", children: link }, idx))) }), jsx("div", { className: "ids-header-1177-admin-nav-item__menu-col-4", children: col4?.map((link, idx) => (jsx("div", { className: "ids-header-1177-admin-nav__menu-item-wrapper", children: link }, idx))) })] }) }));
     };
-    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()] }));
+            "ids-header-1177-admin-nav-item--expanded": isExpanded,
+            "ids-header-1177-admin-nav-item--active": active
+        }), ...props, children: [renderNavItem(), renderContent()] }));
 };
 
 export { IDSHeader1177AdminNavItem };

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

@@ -1,7 +1,7 @@
-import React, { ReactNode } from "react";
+import { ReactNode } from "react";
 import "@inera/ids-design/components/header-1177-admin/header-1177-admin-nav.css";
 interface IDSHeader1177AdminNavProps {
     children?: ReactNode;
 }
-export declare const IDSHeader1177AdminNav: React.FC<IDSHeader1177AdminNavProps>;
+export declare function IDSHeader1177AdminNav({ children, ...props }: IDSHeader1177AdminNavProps): import("react/jsx-runtime").JSX.Element;
 export {};

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

@@ -1,14 +1,13 @@
-"use client";
 import { jsx } from 'react/jsx-runtime';
-import '@inera/ids-design/components/header-1177-admin/header-1177-admin-nav.css';
 import clsx from 'clsx';
 import { useHeaderContext } from '../utils/contexts/HeaderContext.js';
+import '@inera/ids-design/components/header-1177-admin/header-1177-admin-nav.css';
 
-const IDSHeader1177AdminNav = ({ children, ...props }) => {
-    const headerContext = useHeaderContext();
+function IDSHeader1177AdminNav({ children, ...props }) {
+    const headerContext = useHeaderContext() || { unresponsive: false };
     return (jsx("nav", { className: clsx("ids-header-1177-admin-nav", {
-            "ids-header-1177-admin-nav--unresponsive": headerContext?.unresponsive
+            "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,4 +1,4 @@
-import React, { AnchorHTMLAttributes, ReactNode } from "react";
+import React, { ReactNode, AnchorHTMLAttributes } from "react";
 import "@inera/ids-design/components/header-1177-admin/header-1177-admin.css";
 interface IDSHeader1177AdminProps extends React.HTMLAttributes<HTMLDivElement> {
     unresponsive?: boolean;
@@ -15,5 +15,5 @@ interface IDSHeader1177AdminProps extends React.HTMLAttributes<HTMLDivElement> {
     skipToContentLink?: ReactNode;
     children?: ReactNode;
 }
-export declare const IDSHeader1177Admin: React.FC<IDSHeader1177AdminProps>;
+export declare function IDSHeader1177Admin({ unresponsive, srLogoText, brandTextTop, brandText, brandTextBottom, logoHref, logoProps, logo, avatar, mobileMenu, items, skipToContentLink, className, children, ...props }: IDSHeader1177AdminProps): import("react/jsx-runtime").JSX.Element;
 export {};

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

@@ -1,16 +1,15 @@
-"use client";
 import { jsx, jsxs } from 'react/jsx-runtime';
-import '@inera/ids-design/components/header-1177-admin/header-1177-admin.css';
 import clsx from 'clsx';
 import { HeaderProvider } from '../utils/contexts/HeaderContext.js';
+import '@inera/ids-design/components/header-1177-admin/header-1177-admin.css';
 
-const IDSHeader1177Admin = ({ unresponsive = false, srLogoText = "Logotyp", brandTextTop = "", brandText = "", brandTextBottom = "", logoHref = "", logoProps = {}, logo, avatar, mobileMenu, items, skipToContentLink, className, children, ...props }) => {
+function 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": srLogoText, ...logoProps }));
     };
     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-item.d.ts

@@ -1,4 +1,4 @@
-import React, { ReactNode } from "react";
+import { ReactNode } from "react";
 import "@inera/ids-design/components/header-1177-pro/header-1177-pro-item.css";
 interface IDSHeader1177ProItemProps {
     mobile?: boolean;
@@ -8,5 +8,5 @@ interface IDSHeader1177ProItemProps {
     link?: ReactNode;
     onClick?: () => void;
 }
-export declare const IDSHeader1177ProItem: React.FC<IDSHeader1177ProItemProps>;
+export declare function IDSHeader1177ProItem({ mobile, icon, text, href, link, onClick, ...props }: IDSHeader1177ProItemProps): import("react/jsx-runtime").JSX.Element;
 export {};

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

@@ -1,26 +1,33 @@
-"use client";
-import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { isValidElement, cloneElement } from 'react';
-import '@inera/ids-design/components/header-1177-pro/header-1177-pro-item.css';
+import { jsxs, jsx } from 'react/jsx-runtime';
+import React, { isValidElement, cloneElement } from 'react';
 import clsx from 'clsx';
 import { useHeaderContext } from '../utils/contexts/HeaderContext.js';
+import '@inera/ids-design/components/header-1177-pro/header-1177-pro-item.css';
 
-const IDSHeader1177ProItem = ({ mobile = false, icon = "", text = "", href = "", link, onClick, ...props }) => {
-    const headerContext = useHeaderContext();
+function IDSHeader1177ProItem({ mobile = false, icon = "", text = "", href = "", link, onClick, ...props }) {
+    const headerContext = useHeaderContext() || { unresponsive: false };
     const classNames = clsx("ids-header-1177-pro-item", {
-        "ids-header-1177-pro-item--unresponsive": headerContext?.unresponsive,
+        "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-item-icon", "aria-hidden": "true", children: icon && jsx("span", { className: `ids-icon-${icon}` }) }), jsx("div", { className: "ids-header-1177-pro-item-text", children: text })] }));
+    const renderContent = () => (jsx("div", { className: "ids-header-1177-pro-item-icon", "aria-hidden": "true", children: jsx("span", { className: `ids-icon-${icon}` }) }));
     if (link && isValidElement(link)) {
-        return cloneElement(link, {
+        const linkProps = link.props;
+        const hasChildren = !!linkProps.children &&
+            (typeof linkProps.children === "string"
+                ? linkProps.children.trim().length > 0
+                : React.Children.count(linkProps.children) > 0);
+        const newLink = cloneElement(link, {
             ...props,
-            style: { position: "relative", textDecoration: "none" },
-            className: clsx(link.props.className, classNames),
-            children: renderContent()
+            className: clsx(linkProps.className),
+            children: hasChildren ? linkProps.children : text
         });
+        return (jsxs("div", { className: classNames, children: [renderContent(), " ", newLink] }));
+    }
+    if (onClick) {
+        return (jsxs("div", { className: classNames, children: [renderContent(), jsx("button", { onClick: onClick, ...props, children: text })] }));
     }
-    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() }));
-};
+    return (jsxs("div", { className: classNames, children: [renderContent(), jsx("a", { href: href, ...props, children: text })] }));
+}
 
 export { IDSHeader1177ProItem };

package/components/header-1177-pro/header-1177-pro-nav-item.d.ts

@@ -1,15 +1,15 @@
-import React, { ReactElement, ReactNode } from "react";
+import React, { ReactNode, ReactElement } from "react";
 import "@inera/ids-design/components/header-1177-pro/header-1177-pro-nav-item.css";
 import { IDSLinkProps } from "../link/link";
-interface IDSHeader1177ProNavItemProps {
+export interface IDSHeader1177ProNavItemProps {
+    label?: string;
     active?: boolean;
     expanded?: boolean;
-    label?: string;
+    notification?: ReactNode;
+    children?: ReactNode;
     col1?: ReactElement<IDSLinkProps>[];
     col2?: ReactElement<IDSLinkProps>[];
     col3?: ReactElement<IDSLinkProps>[];
     col4?: ReactElement<IDSLinkProps>[];
-    children?: ReactNode;
 }
 export declare const IDSHeader1177ProNavItem: React.FC<IDSHeader1177ProNavItemProps>;
-export {};

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

@@ -1,14 +1,17 @@
 "use client";
 import { jsxs, jsx } from 'react/jsx-runtime';
-import React, { useState, useRef, useEffect } from 'react';
+import { useState, useRef, useEffect } from 'react';
 import '@inera/ids-design/components/header-1177-pro/header-1177-pro-nav-item.css';
 import clsx from 'clsx';
 import { useHeaderContext } from '../utils/contexts/HeaderContext.js';
+import { useElementId } from '../utils/hooks/useElementId.js';
 
-const IDSHeader1177ProNavItem = ({ active = false, expanded = false, label = "", col1, col2, col3, col4, children, ...props }) => {
+const IDSHeader1177ProNavItem = ({ label = "", active = false, expanded = false, notification, children, col1, col2, col3, col4, ...props }) => {
     const headerContext = useHeaderContext();
     const [isExpanded, setIsExpanded] = useState(expanded);
     const containerRef = useRef(null);
+    const contentId = useElementId();
+    //FIXME click on link should also close menu
     const handleClickOutside = (event) => {
         if (containerRef.current && !containerRef.current.contains(event.target)) {
             setIsExpanded(false);
@@ -21,31 +24,24 @@ const IDSHeader1177ProNavItem = ({ active = false, expanded = false, label = "",
             document.removeEventListener("click", handleClickOutside);
         };
     }, [expanded]);
-    const renderItem = () => {
+    const renderNavItem = () => {
         if (label) {
-            return (jsx("button", { onClick: () => setIsExpanded(prev => !prev), "aria-expanded": isExpanded, "aria-controls": "ids-dropdown", children: label }));
+            return (jsxs("button", { "aria-controls": contentId, "aria-expanded": isExpanded, className: "ids-header-1177-pro-nav-item__button", onClick: () => setIsExpanded(prev => !prev), children: [label, " ", notification] }));
+        }
+        else {
+            return (jsxs("span", { className: "ids-header-1177-pro-nav-item__link", children: [children, " ", notification] }));
         }
-        return children;
-    };
-    const renderDropdownLink = (link) => {
-        return React.isValidElement(link)
-            ? React.cloneElement(link, {
-                activeIcon: true,
-                block: true,
-                menu: true,
-                onClick: () => setIsExpanded(false)
-            })
-            : link;
     };
-    const renderDropdown = () => {
+    const renderContent = () => {
         if (!isExpanded)
             return null;
-        return (jsx("div", { id: "ids-dropdown", className: "ids-header-1177-pro-nav-item__menu ids-header-1177-pro-nav-item__menu--expanded", children: jsxs("div", { className: "ids-header-1177-pro-nav-item__menu__content", children: [jsx("div", { className: "ids-header-1177-pro-nav-item__menu__content-col-1", children: col1?.map((link, idx) => (jsx("div", { className: "ids-header-1177-pro-nav__menu-item-wrapper", children: renderDropdownLink(link) }, idx))) }), jsx("div", { className: "ids-header-1177-pro-nav-item__menu__content-col-2", children: col2?.map((link, idx) => (jsx("div", { className: "ids-header-1177-pro-nav__menu-item-wrapper", children: renderDropdownLink(link) }, idx))) }), jsx("div", { className: "ids-header-1177-pro-nav-item__menu__content-col-3", children: col3?.map((link, idx) => (jsx("div", { className: "ids-header-1177-pro-nav__menu-item-wrapper", children: renderDropdownLink(link) }, idx))) }), jsx("div", { className: "ids-header-1177-pro-nav-item__menu__content-col-4", children: col4?.map((link, idx) => (jsx("div", { className: "ids-header-1177-pro-nav__menu-item-wrapper", children: renderDropdownLink(link) }, idx))) })] }) }));
+        return (jsx("div", { id: contentId, className: "ids-header-1177-pro-nav-item__menu ids-header-1177-pro-nav-item__menu--expanded", children: jsxs("div", { className: "ids-header-1177-pro-nav-item__menu-content", children: [jsx("div", { className: "ids-header-1177-pro-nav-item__menu-col-1", children: col1?.map((link, idx) => (jsx("div", { className: "ids-header-1177-pro-nav__menu-item-wrapper", children: link }, idx))) }), jsx("div", { className: "ids-header-1177-pro-nav-item__menu-col-2", children: col2?.map((link, idx) => (jsx("div", { className: "ids-header-1177-pro-nav__menu-item-wrapper", children: link }, idx))) }), jsx("div", { className: "ids-header-1177-pro-nav-item__menu-col-3", children: col3?.map((link, idx) => (jsx("div", { className: "ids-header-1177-pro-nav__menu-item-wrapper", children: link }, idx))) }), jsx("div", { className: "ids-header-1177-pro-nav-item__menu-col-4", children: col4?.map((link, idx) => (jsx("div", { className: "ids-header-1177-pro-nav__menu-item-wrapper", children: link }, idx))) })] }) }));
     };
     return (jsxs("div", { ref: containerRef, className: clsx("ids-header-1177-pro-nav-item", {
             "ids-header-1177-pro-nav-item--unresponsive": headerContext?.unresponsive,
-            "ids-header-1177-pro-nav-item--active": active || isExpanded
-        }), ...props, children: [renderItem(), renderDropdown()] }));
+            "ids-header-1177-pro-nav-item--expanded": isExpanded,
+            "ids-header-1177-pro-nav-item--active": active
+        }), ...props, children: [renderNavItem(), renderContent()] }));
 };
 
 export { IDSHeader1177ProNavItem };

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

@@ -1,10 +1,9 @@
-import React, { ReactNode } from "react";
+import { ReactNode } from "react";
 import "@inera/ids-design/components/header-1177-pro/header-1177-pro-nav.css";
-import "@inera/ids-design/components/header-1177-pro/header-1177-pro-region-picker.css";
 interface IDSHeader1177ProNavProps {
     mobileRegionPicker?: ReactNode;
     mobileAvatar?: ReactNode;
     children?: ReactNode;
 }
-export declare const IDSHeader1177ProNav: React.FC<IDSHeader1177ProNavProps>;
+export declare function IDSHeader1177ProNav({ mobileRegionPicker, mobileAvatar, children, ...props }: IDSHeader1177ProNavProps): import("react/jsx-runtime").JSX.Element;
 export {};

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

@@ -1,15 +1,13 @@
-"use client";
 import { jsxs, jsx } from 'react/jsx-runtime';
-import '@inera/ids-design/components/header-1177-pro/header-1177-pro-nav.css';
-import '@inera/ids-design/components/header-1177-pro/header-1177-pro-region-picker.css';
 import clsx from 'clsx';
 import { useHeaderContext } from '../utils/contexts/HeaderContext.js';
+import '@inera/ids-design/components/header-1177-pro/header-1177-pro-nav.css';
 
-const IDSHeader1177ProNav = ({ mobileRegionPicker, mobileAvatar, children, ...props }) => {
-    const headerContext = useHeaderContext();
+function IDSHeader1177ProNav({ mobileRegionPicker, mobileAvatar, children, ...props }) {
+    const headerContext = useHeaderContext() || { unresponsive: false };
     return (jsxs("nav", { className: clsx("ids-header-1177-pro-nav", {
-            "ids-header-1177-pro-nav--unresponsive": headerContext?.unresponsive
+            "ids-header-1177-pro-nav--unresponsive": headerContext.unresponsive
         }), ...props, children: [jsx("div", { className: "ids-header-1177-pro-nav__inner", children: children }), jsxs("div", { className: "ids-header-1177-pro-nav__inner-mobile", children: [mobileRegionPicker, mobileAvatar] })] }));
-};
+}
 
 export { IDSHeader1177ProNav };

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

@@ -1,4 +1,4 @@
-import React, { ReactNode, PropsWithChildren, AnchorHTMLAttributes } from "react";
+import React, { ReactNode, AnchorHTMLAttributes } from "react";
 import "@inera/ids-design/components/header-1177-pro/header-1177-pro.css";
 interface IDSHeader1177ProProps extends React.HTMLAttributes<HTMLDivElement> {
     hideRegionPicker?: boolean;
@@ -16,5 +16,5 @@ interface IDSHeader1177ProProps extends React.HTMLAttributes<HTMLDivElement> {
     mobileMenu?: ReactNode;
     children?: ReactNode;
 }
-export declare const IDSHeader1177Pro: React.FC<PropsWithChildren<IDSHeader1177ProProps>>;
+export declare function IDSHeader1177Pro({ hideRegionPicker, unresponsive, logoText, srLogoText, logoHref, logoProps, avatar, logoLink, regionPicker, items, skipToContentLink, mobileMenu, className, children, ...props }: IDSHeader1177ProProps): import("react/jsx-runtime").JSX.Element;
 export {};

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

@@ -1,16 +1,12 @@
-"use client";
 import { jsx, jsxs } from 'react/jsx-runtime';
 import clsx from 'clsx';
-import '@inera/ids-design/components/header-1177-pro/header-1177-pro.css';
 import { HeaderProvider } from '../utils/contexts/HeaderContext.js';
+import '@inera/ids-design/components/header-1177-pro/header-1177-pro.css';
 
-const IDSHeader1177Pro = ({ hideRegionPicker = false, unresponsive = false, logoText = "för vårdpersonal", srLogoText = "Logotyp", logoHref = "", logoProps = {}, avatar, logoLink, regionPicker, items, skipToContentLink, mobileMenu, className, children, ...props }) => {
-    return (jsx(HeaderProvider, { value: {
-            unresponsive,
-            hideRegionPicker
-        }, children: jsxs("header", { className: clsx("ids-header-1177-pro", {
+function IDSHeader1177Pro({ hideRegionPicker = false, unresponsive = false, logoText = "för vårdpersonal", srLogoText = "Logotyp", logoHref = "", logoProps = {}, avatar, logoLink, regionPicker, items, skipToContentLink, mobileMenu, className, children, ...props }) {
+    return (jsx(HeaderProvider, { value: { unresponsive, hideRegionPicker }, children: jsxs("header", { className: clsx("ids-header-1177-pro", {
                 "ids-header-1177-pro--unresponsive": unresponsive
             }, className), ...props, children: [skipToContentLink && jsx("div", { className: "ids-header-1177-pro__skip-to-content", children: skipToContentLink }), jsxs("div", { className: "ids-header-1177-pro__main", children: [jsxs("div", { className: "ids-header-1177-pro__main-left", children: [jsx("div", { className: "ids-header-1177-pro__logo", children: logoLink ? (logoLink) : (jsx("a", { className: "ids-header-1177-pro__logo-link", href: logoHref, "aria-label": srLogoText, ...logoProps })) }), jsx("div", { className: "ids-header-1177-pro__logo-text", children: logoText }), !hideRegionPicker && regionPicker && jsx("div", { className: "ids-header-1177-pro__region-picker", children: regionPicker })] }), jsx("div", { className: "ids-header-1177-pro__main-right", children: jsxs("div", { className: "ids-header-1177-pro__items", children: [items, " ", avatar, mobileMenu && jsx("div", { className: "ids-header-1177-pro__mobile-menu", children: mobileMenu })] }) })] }), children] }) }));
-};
+}
 
 export { IDSHeader1177Pro };

package/components/header-inera/header-inera-item.d.ts

@@ -1,6 +1,6 @@
-import React, { ReactNode } from "react";
+import { ReactNode } from "react";
 import "@inera/ids-design/components/header-inera/header-inera-item.css";
-interface IDSHeaderIneraItemProps {
+export interface IDSHeaderIneraItemProps {
     mobile?: boolean;
     separatorLeft?: boolean;
     icon?: string;
@@ -9,5 +9,4 @@ interface IDSHeaderIneraItemProps {
     link?: ReactNode;
     onClick?: () => void;
 }
-export declare const IDSHeaderIneraItem: React.FC<IDSHeaderIneraItemProps>;
-export {};
+export declare function IDSHeaderIneraItem({ mobile, separatorLeft, icon, text, href, link, onClick, ...props }: IDSHeaderIneraItemProps): import("react/jsx-runtime").JSX.Element;