@inera/ids-react 8.0.0 → 8.2.0

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;

package/components/header-inera/header-inera-item.js

@@ -1,26 +1,42 @@
-"use client";
-import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { isValidElement, cloneElement } from 'react';
-import '@inera/ids-design/components/header-inera/header-inera-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-inera/header-inera-item.css';
 
-const IDSHeaderIneraItem = ({ mobile = false, separatorLeft = false, icon = "", text = "", href = "", link, onClick, ...props }) => {
-    const headerContext = useHeaderContext();
+function IDSHeaderIneraItem({ mobile = false, separatorLeft = false, icon = "", text = "", href = "", link, onClick, ...props }) {
+    const headerContext = useHeaderContext() || { unresponsive: false };
     const classNames = clsx("ids-header-inera-item", {
         "ids-header-inera-item--mobile": mobile,
-        "ids-header-inera-item--unresponsive": headerContext?.unresponsive
+        "ids-header-inera-item--unresponsive": headerContext.unresponsive
     });
-    const renderContent = () => (jsxs(Fragment, { children: [jsx("div", { className: "ids-header-inera-item__icon", "aria-hidden": "true", children: icon && jsx("span", { className: `ids-icon-${icon}` }) }), jsx("div", { className: "ids-header-inera-item__text", children: text })] }));
+    const renderContent = () => (jsx("div", { className: "ids-header-inera-item__icon", "aria-hidden": "true", children: jsx("span", { className: `ids-icon-${icon}` }) }));
+    // FIXME 9.0 let the user provide a link or button for all react header items to align with structure for the other frameworks
+    /*  if (link && isValidElement(link)) {
+      return (
+        <div className={classNames}>
+          {renderContent()}
+          {link}
+        </div>
+      );
+    } */
     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: { textDecoration: "none" },
-            className: clsx(link.props.className, classNames),
-            children: renderContent()
+            className: clsx(link.props.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, ...props, children: renderContent() })) : (jsx("a", { className: classNames, href: href, style: { textDecoration: "none" }, ...props, children: renderContent() }));
-};
+    return (jsxs("div", { className: classNames, children: [renderContent(), jsx("a", { href: href, ...props, children: text })] }));
+}
 
 export { IDSHeaderIneraItem };

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

@@ -1,6 +1,6 @@
 "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-inera/header-inera-nav-item.css';
 import clsx from 'clsx';
 import { useHeaderContext } from '../utils/contexts/HeaderContext.js';
@@ -25,34 +25,21 @@ const IDSHeaderIneraNavItem = ({ label = "", active = false, expanded = false, n
     }, [expanded]);
     const renderNavItem = () => {
         if (label) {
-            return (jsxs("button", { "aria-controls": contentId, "aria-expanded": isExpanded, className: clsx("ids-header-inera-nav-item__button", {
-                    "ids-header-inera-nav-item__button--expanded": isExpanded,
-                    "ids-header-inera-nav-item__button--active": active
-                }), onClick: () => setIsExpanded(prev => !prev), children: [label, " ", notification] }));
+            return (jsxs("button", { "aria-controls": contentId, "aria-expanded": isExpanded, className: "ids-header-inera-nav-item__button", onClick: () => setIsExpanded(prev => !prev), children: [label, " ", notification] }));
         }
         else {
-            return (jsxs("span", { className: clsx("ids-header-inera-nav-item__link", {
-                    "ids-header-inera-nav-item__link--active": active
-                }), children: [children, " ", notification] }));
+            return (jsxs("span", { className: "ids-header-inera-nav-item__link", children: [children, " ", notification] }));
         }
     };
-    const renderLink = (link) => {
-        return React.isValidElement(link)
-            ? React.cloneElement(link, {
-                activeIcon: true,
-                block: true,
-                colorPreset: 2,
-                onClick: () => setIsExpanded(false)
-            })
-            : link;
-    };
     const renderContent = () => {
         if (!isExpanded)
             return null;
-        return (jsx("div", { id: contentId, className: "ids-header-inera-nav-item__menu ids-header-inera-nav-item__menu--expanded", children: jsxs("div", { className: "ids-header-inera-nav-item__menu-inner", children: [jsx("div", { className: "ids-header-inera-nav-item__menu-col", children: col1?.map((link, idx) => (jsx("div", { className: "ids-header-inera-nav__menu-item-wrapper", children: renderLink(link) }, idx))) }), jsx("div", { className: "ids-header-inera-nav-item__menu-col", children: col2?.map((link, idx) => (jsx("div", { className: "ids-header-inera-nav__menu-item-wrapper", children: renderLink(link) }, idx))) }), jsx("div", { className: "ids-header-inera-nav-item__menu-col", children: col3?.map((link, idx) => (jsx("div", { className: "ids-header-inera-nav__menu-item-wrapper", children: renderLink(link) }, idx))) }), jsx("div", { className: "ids-header-inera-nav-item__menu-col", children: col4 })] }) }));
+        return (jsx("div", { id: contentId, className: "ids-header-inera-nav-item__menu ids-header-inera-nav-item__menu--expanded", children: jsxs("div", { className: "ids-header-inera-nav-item__menu-content", children: [jsx("div", { className: "ids-header-inera-nav-item__menu-col-1", children: col1?.map((link, idx) => (jsx("div", { className: "ids-header-inera-nav__menu-item-wrapper", children: link }, idx))) }), jsx("div", { className: "ids-header-inera-nav-item__menu-col-2", children: col2?.map((link, idx) => (jsx("div", { className: "ids-header-inera-nav__menu-item-wrapper", children: link }, idx))) }), jsx("div", { className: "ids-header-inera-nav-item__menu-col-3", children: col3?.map((link, idx) => (jsx("div", { className: "ids-header-inera-nav__menu-item-wrapper", children: link }, idx))) }), jsx("div", { className: "ids-header-inera-nav-item__menu-col-4", children: col4 })] }) }));
     };
     return (jsxs("div", { ref: containerRef, className: clsx("ids-header-inera-nav-item", {
-            "ids-header-inera-nav-item--unresponsive": headerContext?.unresponsive
+            "ids-header-inera-nav-item--unresponsive": headerContext?.unresponsive,
+            "ids-header-inera-nav-item--expanded": isExpanded,
+            "ids-header-inera-nav-item--active": active
         }), ...props, children: [renderNavItem(), renderContent()] }));
 };
 

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

@@ -4,4 +4,4 @@ export interface IDSHeaderIneraNavProps {
     srText?: string;
     children?: React.ReactNode;
 }
-export declare const IDSHeaderIneraNav: React.FC<IDSHeaderIneraNavProps>;
+export declare function IDSHeaderIneraNav({ srText, children, ...props }: IDSHeaderIneraNavProps): import("react/jsx-runtime").JSX.Element;

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

@@ -1,15 +1,14 @@
-"use client";
 import { jsx } from 'react/jsx-runtime';
-import '@inera/ids-design/components/header-inera/header-inera-nav.css';
 import clsx from 'clsx';
 import { useHeaderContext } from '../utils/contexts/HeaderContext.js';
+import '@inera/ids-design/components/header-inera/header-inera-nav.css';
 
-const IDSHeaderIneraNav = ({ srText = "Huvudmeny", children, ...props }) => {
-    const headerContext = useHeaderContext();
+function IDSHeaderIneraNav({ srText = "Huvudmeny", children, ...props }) {
+    const headerContext = useHeaderContext() || { unresponsive: false };
     const className = clsx("ids-header-inera-nav", {
-        "ids-header-inera-nav--unresponsive": headerContext?.unresponsive
+        "ids-header-inera-nav--unresponsive": headerContext.unresponsive
     });
     return (jsx("nav", { className: className, "aria-label": srText, ...props, children: jsx("div", { className: "ids-header-inera-nav__nav-items", children: children }) }));
-};
+}
 
 export { IDSHeaderIneraNav };

package/components/header-inera/header-inera.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-inera/header-inera.css";
 interface IDSHeaderIneraProps extends React.HTMLAttributes<HTMLDivElement> {
     logoHref?: string;
@@ -11,5 +11,5 @@ interface IDSHeaderIneraProps extends React.HTMLAttributes<HTMLDivElement> {
     logo?: ReactNode;
     children?: ReactNode;
 }
-export declare const IDSHeaderInera: React.FC<PropsWithChildren<IDSHeaderIneraProps>>;
+export declare function IDSHeaderInera({ logoHref, logoProps, srLogoText, unresponsive, items, mobileMenu, skipToContent, logo, className, children, ...props }: IDSHeaderIneraProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/components/header-inera/header-inera.js

@@ -1,16 +1,12 @@
-"use client";
 import { jsx, jsxs } from 'react/jsx-runtime';
 import clsx from 'clsx';
-import '@inera/ids-design/components/header-inera/header-inera.css';
 import { HeaderProvider } from '../utils/contexts/HeaderContext.js';
+import '@inera/ids-design/components/header-inera/header-inera.css';
 
-const IDSHeaderInera = ({ logoHref = "", logoProps = {}, srLogoText = "Logotyp inera", unresponsive = false, items, mobileMenu, skipToContent, logo, className, children, ...props }) => {
-    return (jsx(HeaderProvider, { value: {
-            unresponsive,
-            hideRegionPicker: true
-        }, children: jsxs("header", { className: clsx("ids-header-inera", {
+function IDSHeaderInera({ logoHref = "", logoProps = {}, srLogoText = "Logotyp inera", unresponsive = false, items, mobileMenu, skipToContent, logo, className, children, ...props }) {
+    return (jsx(HeaderProvider, { value: { unresponsive, hideRegionPicker: true }, children: jsxs("header", { className: clsx("ids-header-inera", {
                 "ids-header-inera--unresponsive": unresponsive
             }, className), ...props, children: [skipToContent && jsx("div", { className: "ids-header-inera__skip-to-content", children: skipToContent }), jsxs("div", { className: "ids-header-inera__inner", children: [jsxs("div", { className: "ids-header-inera__main", children: [logoHref ? (jsx("a", { href: logoHref, "aria-label": srLogoText, className: "ids-header-inera__logo", ...logoProps })) : logo ? (jsx("div", { className: "ids-header-inera__logo-custom", children: logo })) : (jsx("div", { className: "ids-header-inera__logo" })), jsxs("div", { className: "ids-header-inera__items", children: [items, " ", mobileMenu] })] }), children] })] }) }));
-};
+}
 
 export { IDSHeaderInera };

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

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

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

@@ -1,27 +1,31 @@
-"use client";
-import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { isValidElement, cloneElement } from 'react';
-import '@inera/ids-design/components/header-inera-admin/header-inera-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-inera-admin/header-inera-admin-item.css';
 
-const IDSHeaderIneraAdminItem = ({ mobile = false, separatorLeft = false, icon = "", text, href = "", link, onClick, ...props }) => {
+function IDSHeaderIneraAdminItem({ mobile = false, separatorLeft = false, icon = "", text, href = "", link, onClick, ...props }) {
     const headerContext = useHeaderContext();
     const classNames = clsx("ids-header-inera-admin-item", {
         "ids-header-inera-admin-item--mobile": mobile,
-        "ids-header-inera-admin-item__separator": separatorLeft,
+        "ids-header-inera-admin-item--separator": separatorLeft,
         "ids-header-inera-admin-item--unresponsive": headerContext?.unresponsive
     });
-    const renderContent = () => (jsxs(Fragment, { children: [icon && (jsx("div", { className: "ids-header-inera-admin-item__icon", "aria-hidden": "true", children: jsx("span", { className: `ids-icon-${icon}` }) })), jsx("div", { className: "ids-header-inera-admin-item__text", children: text })] }));
+    const renderContent = () => (jsx("div", { className: "ids-header-inera-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,
-            style: { textDecoration: "none" },
-            className: clsx(link.props.className, classNames),
-            children: renderContent()
+            className: clsx(link.props.className),
+            children: hasChildren ? linkProps.children : text
         });
+        return (jsxs("div", { className: classNames, children: [renderContent(), " ", newLink] }));
     }
-    return onClick ? (jsx("button", { className: classNames, onClick: onClick, ...props, children: renderContent() })) : (jsx("a", { className: classNames, href: href, style: { textDecoration: "none" }, ...props, children: renderContent() }));
-};
+    return onClick ? (jsxs("div", { className: classNames, children: [renderContent(), jsx("button", { onClick: onClick, ...props, children: text })] })) : (jsxs("div", { className: classNames, children: [renderContent(), jsx("a", { href: href, ...props, children: text })] }));
+}
 
 export { IDSHeaderIneraAdminItem };

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

@@ -1,11 +1,10 @@
 import React, { ReactNode, ReactElement } from "react";
 import "@inera/ids-design/components/header-inera-admin/header-inera-admin-nav-item.css";
 import { IDSLinkProps } from "../link/link";
-interface IDSHeaderIneraAdminNavItemProps {
+export interface IDSHeaderIneraAdminNavItemProps {
     label?: string;
     active?: boolean;
     expanded?: boolean;
-    notification?: ReactNode;
     children?: ReactNode;
     col1?: ReactElement<IDSLinkProps>[];
     col2?: ReactElement<IDSLinkProps>[];
@@ -13,4 +12,3 @@ interface IDSHeaderIneraAdminNavItemProps {
     col4?: ReactNode;
 }
 export declare const IDSHeaderIneraAdminNavItem: React.FC<IDSHeaderIneraAdminNavItemProps>;
-export {};

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

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

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

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

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

@@ -1,15 +1,14 @@
-"use client";
 import { jsx } from 'react/jsx-runtime';
-import '@inera/ids-design/components/header-inera-admin/header-inera-admin-nav.css';
 import clsx from 'clsx';
 import { useHeaderContext } from '../utils/contexts/HeaderContext.js';
+import '@inera/ids-design/components/header-inera-admin/header-inera-admin-nav.css';
 
-const IDSHeaderIneraAdminNav = ({ srText = "Huvudmeny", children, ...props }) => {
+function IDSHeaderIneraAdminNav({ srText = "Huvudmeny", children, ...props }) {
     const headerContext = useHeaderContext();
     const classNames = clsx("ids-header-inera-admin-nav", {
         "ids-header-inera-admin-nav--unresponsive": headerContext?.unresponsive
     });
     return (jsx("nav", { className: classNames, "aria-label": srText, ...props, children: jsx("div", { className: "ids-header-inera-admin-nav__nav-items", children: children }) }));
-};
+}
 
 export { IDSHeaderIneraAdminNav };

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

@@ -13,4 +13,4 @@ export interface IDSHeaderIneraAdminProps extends React.HTMLAttributes<HTMLDivEl
     mobileMenu?: ReactNode;
     children?: ReactNode;
 }
-export declare const IDSHeaderIneraAdmin: React.FC<IDSHeaderIneraAdminProps>;
+export declare function IDSHeaderIneraAdmin({ brandText, unresponsive, showLogo, items, avatar, skipToContent, brandLink, srLogoText, serviceName, mobileMenu, className, children, ...props }: IDSHeaderIneraAdminProps): import("react/jsx-runtime").JSX.Element;