@inera/ids-react 7.2.0 → 8.1.0

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.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();
-    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
+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--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 = () => (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, margin: 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-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 {};

package/components/header-1177-pro/header-1177-pro-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-pro/header-1177-pro-menu-mobile.css';
+import { useHeaderContext } from '../utils/contexts/HeaderContext.js';
+import clsx from 'clsx';
+
+const IDSHeader1177ProMenuMobile = ({ label = "", 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-pro-menu-mobile-component", ref: containerRef, ...props, children: [jsxs("button", { onClick: toggleExpanded, "aria-expanded": isExpanded, "aria-label": "Meny", className: clsx("ids-header-1177-pro-menu-mobile", {
+                    "ids-header-1177-pro-menu-mobile--unresponsive": headerContext?.unresponsive
+                }), children: [label, jsx("div", { className: "ids-hamburger", children: jsx("span", { className: "ids-hamburger__lines" }) })] }), isExpanded && (jsx("div", { className: "ids-header-1177-pro-menu-mobile__items", ref: menuRef, children: children }))] }));
+};
+
+export { IDSHeader1177ProMenuMobile };

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__default, { 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 }) => {
+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 renderLink = (link) => {
-        return React__default.isValidElement(link)
-            ? React__default.cloneElement(link, {
-                activeIcon: true,
-                block: true,
-                colorPreset: 1,
-                onClick: () => setIsExpanded(false)
-            })
-            : link;
     };
-    const renderDropdown = () => {
+    const renderContent = () => {
         if (!isExpanded)
             return null;
-        return (jsx("div", { id: "ids-dropdown", className: "ids-header-1177-pro__items__item-dropdown", children: jsxs("div", { className: "ids-header-1177-pro__items__item-dropdown__content", children: [jsx("div", { className: "ids-header-1177-pro__items__item-dropdown__content-col-1", children: col1?.map((link, idx) => (jsx("div", { className: "ids-header-1177-pro__item-wrapper", children: renderLink(link) }, idx))) }), jsx("div", { className: "ids-header-1177-pro__items__item-dropdown__content-col-2", children: col2?.map((link, idx) => (jsx("div", { className: "ids-header-1177-pro__item-wrapper", children: renderLink(link) }, idx))) }), jsx("div", { className: "ids-header-1177-pro__items__item-dropdown__content-col-3", children: col3?.map((link, idx) => (jsx("div", { className: "ids-header-1177-pro__item-wrapper", children: renderLink(link) }, idx))) }), jsx("div", { className: "ids-header-1177-pro__items__item-dropdown__content-col-4", children: col4?.map((link, idx) => (jsx("div", { className: "ids-header-1177-pro__item-wrapper", children: renderLink(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
-        }), children: [renderItem(), renderDropdown()] }));
+    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--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 {
-    regionIconMobile?: ReactNode;
-    mobileMenu?: ReactNode;
+    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,30 +1,13 @@
-"use client";
-import { jsx, jsxs } from 'react/jsx-runtime';
-import { useState } 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';
+import { jsxs, jsx } from 'react/jsx-runtime';
 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 = ({ regionIconMobile, mobileMenu, children }) => {
-    const headerContext = useHeaderContext();
-    const [regionPickerExpanded, setRegionPickerExpanded] = useState(false);
-    const toggleRegion = () => {
-        setRegionPickerExpanded(prev => !prev);
-    };
-    const renderRegionPicker = () => {
-        if (headerContext?.hideRegionPicker)
-            return null;
-        return (jsx("button", { className: clsx("ids-header-1177-pro__region-picker-button--mobile", {
-                "ids-header-1177-pro__region-picker-button--mobile--expanded": regionPickerExpanded
-            }), "aria-label": headerContext?.regionPickerText, "aria-expanded": regionPickerExpanded, onClick: toggleRegion, children: regionIconMobile ? (regionIconMobile) : (jsxs("div", { className: "ids-header-1177-pro__region-picker__text", children: [jsx("span", { className: "ids-header-1177-pro__region-picker-icon" }), headerContext?.regionPickerText] })) }));
-    };
-    return (jsx("nav", { className: clsx("ids-header-1177-pro__nav", {
-            "ids-header-1177-pro__nav--fluid": headerContext?.fluid,
-            "ids-header-1177-pro__nav--unresponsive": headerContext?.unresponsive
-        }), children: jsxs("div", { className: clsx("ids-header-1177-pro__nav-inner", {
-                "ids-header-1177-pro__nav-inner--no-region-picker": headerContext?.hideRegionPicker
-            }), children: [renderRegionPicker(), children, mobileMenu] }) }));
-};
+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
+        }), ...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-region-picker-mobile.d.ts

@@ -0,0 +1,9 @@
+import React, { ReactNode } from "react";
+import "@inera/ids-design/components/header-1177-pro/header-1177-pro-region-picker-mobile.css";
+export interface IDSHeader1177ProRegionPickerMobileProps {
+    text?: string;
+    expanded?: boolean;
+    onToggleRegion?: (isExpanded: boolean) => void;
+    children?: ReactNode;
+}
+export declare const IDSHeader1177ProRegionPickerMobile: React.FC<IDSHeader1177ProRegionPickerMobileProps>;

package/components/header-1177-pro/header-1177-pro-region-picker-mobile.js

@@ -0,0 +1,36 @@
+import { jsx, jsxs } from 'react/jsx-runtime';
+import React, { useState, useRef, isValidElement, cloneElement } from 'react';
+import '@inera/ids-design/components/header-1177-pro/header-1177-pro-region-picker-mobile.css';
+import clsx from 'clsx';
+import { useHeaderContext } from '../utils/contexts/HeaderContext.js';
+
+const IDSHeader1177ProRegionPickerMobile = ({ text = "Välj region", expanded: propExpanded = false, onToggleRegion, children, ...props }) => {
+    const [isExpanded, setIsExpanded] = useState(propExpanded);
+    const regionIconRef = useRef(null);
+    const headerContext = useHeaderContext();
+    const toggleRegion = () => {
+        const newExpanded = !isExpanded;
+        setIsExpanded(newExpanded);
+        onToggleRegion?.(newExpanded);
+    };
+    const hasChildren = React.Children.count(children) > 0;
+    const renderChild = (child) => {
+        if (isValidElement(child)) {
+            const existingClass = child.props.className;
+            return cloneElement(child, {
+                ref: regionIconRef,
+                size: "m",
+                colorPreset: 4,
+                className: clsx(existingClass)
+            });
+        }
+        return null;
+    };
+    return headerContext?.hideRegionPicker ? null : (jsx("div", { className: clsx("ids-header-1177-pro-region-picker-mobile", {
+            "ids-header-1177-pro-region-picker-mobile--selected-region": hasChildren
+        }), ...props, children: jsxs("button", { onClick: toggleRegion, className: clsx("ids-header-1177-pro-region-picker-mobile__button", {
+                "ids-header-1177-pro-region-picker-mobile__button--expanded": isExpanded
+            }), "aria-label": text, children: [jsx("div", { className: "ids-header-1177-pro-region-picker-mobile__region-icon", children: renderChild(children) }), jsxs("span", { className: "ids-header-1177-pro-region-picker-mobile__button-text", children: [" ", text] })] }) }));
+};
+
+export { IDSHeader1177ProRegionPickerMobile };

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

@@ -0,0 +1,9 @@
+import React, { ReactNode } from "react";
+import "@inera/ids-design/components/header-1177-pro/header-1177-pro-region-picker.css";
+export interface IDSHeader1177ProRegionPickerProps {
+    text?: string;
+    expanded?: boolean;
+    onToggleRegion?: (isExpanded: boolean) => void;
+    children?: ReactNode;
+}
+export declare const IDSHeader1177ProRegionPicker: React.FC<IDSHeader1177ProRegionPickerProps>;

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

@@ -0,0 +1,34 @@
+import { jsxs, jsx } from 'react/jsx-runtime';
+import React, { useState, useRef, isValidElement, cloneElement } from 'react';
+import '@inera/ids-design/components/header-1177-pro/header-1177-pro-region-picker.css';
+import clsx from 'clsx';
+
+const IDSHeader1177ProRegionPicker = ({ text = "Välj region", expanded: propExpanded = false, onToggleRegion, children, ...props }) => {
+    const [isExpanded, setIsExpanded] = useState(propExpanded);
+    const regionIconRef = useRef(null);
+    const toggleRegion = () => {
+        const newExpanded = !isExpanded;
+        setIsExpanded(newExpanded);
+        onToggleRegion?.(newExpanded);
+    };
+    const hasChildren = React.Children.count(children) > 0;
+    const renderChild = (child) => {
+        if (isValidElement(child)) {
+            const existingClass = child.props.className;
+            return cloneElement(child, {
+                ref: regionIconRef,
+                size: "m",
+                colorPreset: 4,
+                className: clsx(existingClass)
+            });
+        }
+        return null;
+    };
+    return (jsxs("div", { className: clsx("ids-header-1177-pro-region-picker", {
+            "ids-header-1177-pro-region-picker--selected-region": hasChildren
+        }), ...props, children: [jsx("div", { className: "ids-header-1177-pro-region-picker__region-icon", children: renderChild(children) }), jsx("div", { className: "ids-header-1177-pro-region-picker__selector", children: jsx("button", { onClick: toggleRegion, className: clsx("ids-header-1177-pro-region-picker__button", {
+                        "ids-header-1177-pro-region-picker__button--expanded": isExpanded
+                    }), "aria-label": text, children: text }) })] }));
+};
+
+export { IDSHeader1177ProRegionPicker };

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

@@ -1,23 +1,20 @@
-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";
-import "@inera/ids-design/components/header-1177-pro/header-1177-pro-region-picker.css";
 interface IDSHeader1177ProProps extends React.HTMLAttributes<HTMLDivElement> {
-    regionPickerText?: string;
-    regionPickerExpanded?: boolean;
     hideRegionPicker?: boolean;
-    fluid?: boolean;
     unresponsive?: boolean;
     logoText?: string;
-    srLogoLabel?: string;
+    srLogoText?: string;
     logoHref?: string;
     logoProps?: AnchorHTMLAttributes<HTMLAnchorElement>;
-    onToggleRegion?: (isExpanded: boolean) => void;
+    regionPicker?: ReactNode;
     avatar?: ReactNode;
-    logo?: ReactNode;
+    logoLink?: ReactNode;
     regionIcon?: ReactNode;
     items?: ReactNode;
     skipToContentLink?: ReactNode;
+    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,40 +1,12 @@
-"use client";
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { useState, useEffect } from 'react';
 import clsx from 'clsx';
-import '@inera/ids-design/components/header-1177-pro/header-1177-pro.css';
-import '@inera/ids-design/components/header-1177-pro/header-1177-pro-region-picker.css';
 import { HeaderProvider } from '../utils/contexts/HeaderContext.js';
+import '@inera/ids-design/components/header-1177-pro/header-1177-pro.css';
 
-const IDSHeader1177Pro = ({ regionPickerText = "Välj region", hideRegionPicker: initialRegionPicker = false, regionPickerExpanded: initialExpanded = false, fluid = false, unresponsive = false, logoText = "för vårdpersonal", srLogoLabel = "Logotyp", logoHref = "", logoProps = {}, onToggleRegion, avatar, logo, regionIcon, items, skipToContentLink, className, children }) => {
-    const [isRegionExpanded, setIsRegionExpanded] = useState(initialExpanded);
-    const [hideRegionPicker, setHideRegionPicker] = useState(initialRegionPicker);
-    useEffect(() => {
-        if (avatar) {
-            // No region picker when avatar
-            setIsRegionExpanded(false);
-            setHideRegionPicker(true);
-        }
-        else {
-            setHideRegionPicker(initialRegionPicker);
-        }
-    }, [avatar]);
-    const toggleRegion = () => {
-        const newValue = !isRegionExpanded;
-        setIsRegionExpanded(newValue);
-        onToggleRegion?.(newValue);
-    };
-    return (jsx(HeaderProvider, { value: {
-            unresponsive,
-            fluid,
-            hideRegionPicker,
-            regionPickerText
-        }, children: jsxs("header", { className: clsx("ids-header-1177-pro", {
-                "ids-header-1177-pro--unresponsive": unresponsive,
-                "ids-header-1177-pro--fluid": fluid
-            }, className), children: [skipToContentLink && (jsx("div", { className: "ids-header-1177-pro__skip-to-content", children: skipToContentLink })), jsx("div", { className: "ids-header-1177-pro__container", children: jsxs("div", { className: "ids-header-1177-pro__inner", children: [jsxs("div", { className: "ids-header-1177-pro__logo-col", children: [jsx("div", { className: "ids-header-1177-pro__logo", children: logo ? (logo) : (jsx("a", { className: "ids-header-1177-pro__logo-link", href: logoHref, "aria-label": srLogoLabel, ...logoProps })) }), jsx("div", { className: "ids-header-1177-pro__logo-text", children: logoText }), !hideRegionPicker && !avatar && (jsx("button", { className: clsx("ids-header-1177-pro__region-picker-button", {
-                                            "ids-header-1177-pro__region-picker-button--expanded": isRegionExpanded
-                                        }), onClick: toggleRegion, "aria-label": regionPickerText, "aria-expanded": isRegionExpanded, children: regionIcon || regionPickerText }))] }), jsx("div", { className: "ids-header-1177-pro__items", children: jsxs("div", { className: "ids-header-1177-pro__items-inner", children: [items, " ", avatar] }) })] }) }), children] }) }));
-};
+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,27 +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__separator": separatorLeft,
-        "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-label": text, 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-menu-mobile.d.ts

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