@dnanpm/styleguide 3.11.0 → 3.11.2

package/build/cjs/components/MainHeaderNavigation/ChildComponents/MainNavTooltipMenuExportedStyles.js

@@ -13,15 +13,15 @@ const TooltipWrapper = styledComponents.styled.button `
     padding: 0;
     overflow: visible;
     background: transparent;
-    color: ${p => (p.isHighlighted ? theme.default.color.text.pink : 'inherit')};
+    color: ${p => (p.$isHighlighted ? theme.default.color.text.pink : 'inherit')};
     font: inherit;
     line-height: normal;
     -webkit-font-smoothing: inherit;
     -moz-osx-font-smoothing: inherit;
     -webkit-appearance: none;
     cursor: pointer;
-    width: ${p => (p.isLoggedIn ? '6.25rem' : '100%')};
-    border-left: ${p => (p.isLoggedIn ? `2px solid ${theme.default.color.line.L03}` : 'none')};
+    width: ${p => (p.$isLoggedIn ? '6.25rem' : '100%')};
+    border-left: ${p => (p.$isLoggedIn ? `2px solid ${theme.default.color.line.L03}` : 'none')};
     &:active,
     &:focus {
         > svg,
@@ -32,7 +32,8 @@ const TooltipWrapper = styledComponents.styled.button `
     &:focus-visible {
         outline: 0;
         border-radius: ${theme.default.radius.s};
-        box-shadow: 0px 0px 0px 2px ${theme.default.color.focus.light},
+        box-shadow:
+            0px 0px 0px 2px ${theme.default.color.focus.light},
             0px 0px 0px 4px ${theme.default.color.focus.dark};
         > svg,
         > span {
@@ -43,14 +44,14 @@ const TooltipWrapper = styledComponents.styled.button `
         align-content: center;
         display: flex;
         margin: 0 auto;
-        @media (min-width: ${p => p.collapseSize + 1}px) {
+        @media (min-width: ${p => p.$collapseSize + 1}px) {
             height: 1.625em;
             width: 1.625em;
         }
     }
     > span {
         display: none;
-        @media (min-width: ${p => p.collapseSize + 1}px) {
+        @media (min-width: ${p => p.$collapseSize + 1}px) {
             font-size: ${theme.default.fontSize.xs};
             font-weight: ${theme.default.fontWeight.medium};
             width: 100%;

package/build/cjs/components/MainHeaderNavigation/ChildComponents/MobileMenu.d.ts

@@ -1,3 +1,7 @@
 import React from 'react';
+import type { MobileMenuBackLink } from '../types/globalNavProps';
+export declare const MenuItemBackLink: ({ currentLevel, backRef, }: MobileMenuBackLink & {
+    backRef?: React.RefObject<HTMLButtonElement>;
+}) => React.JSX.Element;
 declare const RenderMobileMenu: () => React.JSX.Element | null;
 export default RenderMobileMenu;

package/build/cjs/components/MainHeaderNavigation/ChildComponents/MobileMenu.js

@@ -9,7 +9,6 @@ var styledComponents = require('styled-components');
 var theme = require('../../../themes/theme.js');
 var navigation = require('../../../themes/themeComponents/navigation.js');
 var styledUtils = require('../../../utils/styledUtils.js');
-var MobileMenuContext = require('../context/MobileMenuContext.js');
 var NavContext = require('../context/NavContext.js');
 var globalNavStyles = require('../globalNavStyles.js');
 var LinkModifier = require('./LinkModifier.js');
@@ -28,7 +27,7 @@ const MobileMenuWrapper = styledComponents.styled(reactSpring.animated.div) `
 `;
 const mobileMenu = `calc(100vh - ${navigation.headerMaxHeight})`;
 const MenuLinkBackLink = styledComponents.styled(globalNavStyles.MenuLink) ``;
-const MobileMenuContainer = styledComponents.styled.div `
+const MobileMenuContainer = styledComponents.styled.nav `
     width: 100%;
     position: absolute;
     top: ${navigation.navMaxHeight};
@@ -83,7 +82,7 @@ const MobileMenuContainer = styledComponents.styled.div `
     }
     ${globalNavStyles.FeaturedBlock} {
         border-bottom: 1px solid ${theme.default.color.line.L04};
-        > a {
+        section > a {
             font-size: ${theme.default.fontSize.s};
             line-height: ${theme.default.lineHeight.s};
             padding: ${styledUtils.getMultipliedSize(theme.default.base.baseHeight, 1)};
@@ -91,31 +90,25 @@ const MobileMenuContainer = styledComponents.styled.div `
         }
     }
 `;
-const MenuItemBackLink = ({ currentLevel }) => {
-    const { handleNavMenuClick, lang, menuLevel: { scrollPosition }, level1Items, level2Items, getBackLink, } = React.useContext(NavContext.default);
-    const levels = {
-        level1Items,
-        level2Items,
-    };
-    const menuElementLevel = `level${currentLevel - 1}Items`;
-    const menuElements = levels[menuElementLevel];
+const MenuItemBackLink = ({ currentLevel, backRef, }) => {
+    const { backToPreviousCategoryLabel, handleNavMenuClick, lang, menuLevel: { scrollPosition }, level1Items, level2Items, getBackLink, } = React.useContext(NavContext.default);
+    const menuElements = currentLevel === 2 ? level1Items : level2Items;
+    const tabNavigationDisabled = scrollPosition !== currentLevel - 1;
+    const backLink = getBackLink(menuElements, currentLevel - 1);
     const mobileMenuBackClick = () => {
         handleNavMenuClick(null, `level${currentLevel - 1}Mobile`);
     };
-    const tabNavigationDisabled = scrollPosition !== currentLevel - 1;
-    const backLink = getBackLink(menuElements, currentLevel - 1);
-    return (React__default.default.createElement(globalNavStyles.MenuItem, { key: `back-${backLink.id}`, "data-testid": `mobile-nav-menu-backlink-level-${currentLevel}` },
-        React__default.default.createElement(MenuLinkBackLink, { as: "button", onClick: mobileMenuBackClick, tabIndex: tabNavigationDisabled ? -1 : undefined },
+    return (React__default.default.createElement(globalNavStyles.MenuItem, { "data-testid": `mobile-nav-menu-backlink-level-${currentLevel}` },
+        React__default.default.createElement(MenuLinkBackLink, { as: "button", ref: backRef, onClick: mobileMenuBackClick, tabIndex: tabNavigationDisabled ? -1 : undefined, "aria-label": `${backToPreviousCategoryLabel} ${backLink.titles[lang]}` },
             React__default.default.createElement(icons.ChevronLeft, { size: "1.5rem" }),
             backLink.titles[lang])));
 };
-const CreateSubMenuItem = ({ menuItem, currentLevel, itemIndex }) => {
+const SubMenuItem = ({ menuItem, currentLevel, itemIndex, mobileMenuRef, firstItemRef, }) => {
     const { handleNavMenuClick, menuLevel, lang, currentUrl } = React.useContext(NavContext.default);
-    const { mobileMenuRef } = React.useContext(MobileMenuContext.default);
-    const hasChildren = menuItem.pages.length;
+    const hasChildren = !!menuItem.pages.length;
     const indexLevel = currentLevel - 1;
     const tabNavigationDisabled = menuLevel.scrollPosition !== indexLevel;
-    const menuUrl = menuItem.urls[lang] || '';
+    const menuUrl = menuItem.urls[lang];
     const mobileMenuClick = (element) => (e) => {
         var _a, _b;
         (_b = (_a = mobileMenuRef === null || mobileMenuRef === void 0 ? void 0 : mobileMenuRef.current) === null || _a === void 0 ? void 0 : _a.scroll) === null || _b === void 0 ? void 0 : _b.call(_a, {
@@ -126,37 +119,50 @@ const CreateSubMenuItem = ({ menuItem, currentLevel, itemIndex }) => {
         e.preventDefault();
         handleNavMenuClick(element.id, `level${currentLevel}Mobile`);
     };
-    const renderMenuItem = (children) => (React__default.default.createElement(globalNavStyles.MenuItem, { key: menuItem.id, "data-testid": `mobile-menu-level-${currentLevel}-link-${itemIndex + 1}`, isActive: LinkModifier.isSelected(currentUrl, menuUrl, true) }, children));
+    const renderMenuItem = (children) => (React__default.default.createElement(globalNavStyles.MenuItem, { key: menuItem.id, "data-testid": `mobile-menu-level-${currentLevel}-link-${itemIndex + 1}`, "$isActive": LinkModifier.isSelected(currentUrl, menuUrl, true) }, children));
     if (hasChildren && currentLevel < 3) {
-        return renderMenuItem(React__default.default.createElement(globalNavStyles.MenuLink, { as: "button", onClick: mobileMenuClick(menuItem), tabIndex: tabNavigationDisabled ? -1 : undefined },
+        return renderMenuItem(React__default.default.createElement(globalNavStyles.MenuLink, { as: "button", ref: firstItemRef, onClick: mobileMenuClick(menuItem), tabIndex: tabNavigationDisabled ? -1 : undefined },
             menuItem.titles[lang],
             React__default.default.createElement(icons.ChevronRight, { color: theme.default.color.default.pink })));
     }
     return renderMenuItem(React__default.default.createElement(LinkModifier.default, { menuItem: menuItem, disabledTabIndex: tabNavigationDisabled }));
 };
-const SubMenuMobile = ({ currentLevel, menuItem }) => {
-    const featuredItems = menuItem.pages.filter(subMenuItem => !subMenuItem.pages.length && currentLevel === 2);
+const SubMenuMobile = ({ currentLevel, menuItem, mobileMenuRef }) => {
+    const { collapseSize, featuredItemsAriaLabel, menuLevel } = React.useContext(NavContext.default);
     const indexLevel = currentLevel - 1;
-    const { collapseSize, menuLevel: { scrollPosition }, } = React.useContext(NavContext.default);
-    const tabNavigationDisabled = scrollPosition !== indexLevel;
-    if (!menuItem.pages.length) {
+    const tabNavigationDisabled = menuLevel.scrollPosition !== indexLevel;
+    const backRef = React.useRef(null);
+    const firstItemRef = React.useRef(null);
+    React.useEffect(() => {
+        // Delay focus to allow animation to finish
+        const timer = setTimeout(() => {
+            if (currentLevel === 1 && firstItemRef.current) {
+                firstItemRef.current.focus();
+            }
+            if (currentLevel > 1 && backRef.current) {
+                backRef.current.focus();
+            }
+        }, 300);
+        return () => clearTimeout(timer);
+    }, [menuItem, currentLevel]);
+    if (!(menuItem === null || menuItem === void 0 ? void 0 : menuItem.pages.length)) {
         return null;
     }
+    const featuredItems = currentLevel === 2 ? menuItem.pages.filter(subMenuItem => !subMenuItem.pages.length) : [];
+    const menuItems = menuItem.pages.filter(subMenuItem => !featuredItems.includes(subMenuItem));
     return (React__default.default.createElement(React__default.default.Fragment, null,
-        currentLevel > 1 && React__default.default.createElement(MenuItemBackLink, { currentLevel: currentLevel }),
-        featuredItems.length > 0 && (React__default.default.createElement(globalNavStyles.FeaturedBlock, { collapseSize: collapseSize }, featuredItems.map(subMenuItem => (React__default.default.createElement(LinkModifier.default, { key: subMenuItem.id, menuItem: subMenuItem, showIcon: true, disabledTabIndex: tabNavigationDisabled }))))),
-        menuItem.pages
-            .filter(subMenuItem => !featuredItems.includes(subMenuItem))
-            .map((subMenuItem, index) => (React__default.default.createElement(CreateSubMenuItem, { currentLevel: currentLevel, itemIndex: index, key: subMenuItem.id, menuItem: subMenuItem })))));
+        currentLevel > 1 && React__default.default.createElement(MenuItemBackLink, { backRef: backRef, currentLevel: currentLevel }),
+        featuredItems.length > 0 && (React__default.default.createElement(globalNavStyles.FeaturedBlock, { "$collapseSize": collapseSize },
+            React__default.default.createElement("section", { "aria-label": featuredItemsAriaLabel }, featuredItems.map(subMenuItem => (React__default.default.createElement(LinkModifier.default, { key: subMenuItem.id, menuItem: subMenuItem, showIcon: true, disabledTabIndex: tabNavigationDisabled })))))),
+        menuItems.map((subMenuItem, index) => (React__default.default.createElement(SubMenuItem, { currentLevel: currentLevel, itemIndex: index, key: subMenuItem.id, menuItem: subMenuItem, mobileMenuRef: mobileMenuRef, firstItemRef: index === 0 ? firstItemRef : undefined })))));
 };
-const NavigationMenuMobile = () => {
+const NavigationMenuMobile = ({ mobileMenuRef }) => {
     const { items, menuLevel, level1Items, level2Items } = React.useContext(NavContext.default);
     const { mainNavigation } = items;
     if (!(mainNavigation === null || mainNavigation === void 0 ? void 0 : mainNavigation.pages.length)) {
         return null;
     }
-    const renderMenuList = (scrollPosition, level, menuItem) => (React__default.default.createElement(globalNavStyles.MenuList, { "aria-hidden": menuLevel.scrollPosition !== scrollPosition, "aria-disabled": menuLevel.scrollPosition !== scrollPosition, "data-testid": `mobile-nav-menu-level-${level}`, isInView: menuLevel.scrollPosition === scrollPosition },
-        React__default.default.createElement(SubMenuMobile, { currentLevel: level, menuItem: menuItem })));
+    const renderMenuList = (scrollPosition, level, menuItem) => (React__default.default.createElement(globalNavStyles.MenuList, { "aria-hidden": menuLevel.scrollPosition !== scrollPosition, "aria-disabled": menuLevel.scrollPosition !== scrollPosition, "data-testid": `mobile-nav-menu-level-${level}`, "$isInView": menuLevel.scrollPosition === scrollPosition }, menuLevel.scrollPosition === scrollPosition && (React__default.default.createElement(SubMenuMobile, { currentLevel: level, menuItem: menuItem, mobileMenuRef: mobileMenuRef }))));
     return (React__default.default.createElement(React__default.default.Fragment, null,
         renderMenuList(0, 1, mainNavigation),
         menuLevel.level1Mobile !== null &&
@@ -170,16 +176,13 @@ const RenderMobileMenu = () => {
     const slidingMenuAnimation = reactSpring.useSpring({
         transform: `translateX(${(menuLevel.scrollPosition / navigation.menuLevelsAmount) * -100}%)`,
     });
-    const mobileMenuContext = React.useMemo(() => ({
-        mobileMenuRef,
-    }), [mobileMenuRef]);
     if (!isMobileMenuOpen) {
         return null;
     }
-    return (React__default.default.createElement(MobileMenuContainer, { ref: mobileMenuRef },
-        React__default.default.createElement(MobileMenuContext.default.Provider, { value: mobileMenuContext },
-            React__default.default.createElement(MobileMenuWrapper, { style: slidingMenuAnimation },
-                React__default.default.createElement(NavigationMenuMobile, null)))));
+    return (React__default.default.createElement(MobileMenuContainer, { ref: mobileMenuRef, role: "dialog", "aria-modal": "true" },
+        React__default.default.createElement(MobileMenuWrapper, { style: slidingMenuAnimation },
+            React__default.default.createElement(NavigationMenuMobile, { mobileMenuRef: mobileMenuRef }))));
 };
 
+exports.MenuItemBackLink = MenuItemBackLink;
 exports.default = RenderMobileMenu;

package/build/cjs/components/MainHeaderNavigation/MainHeaderNavigation.d.ts

@@ -2,10 +2,12 @@ import type { ComponentType, MouseEvent, ReactNode } from 'react';
 import React from 'react';
 import type { GlobalNavItems } from './types/globalNavProps';
 export interface MainHeaderNavigationProps {
+    backToPreviousCategoryLabel?: string;
     businessMenuAriaLabel?: string;
     categoryCollectionText?: string;
     /** Allows to pass a custom className */
     className?: string;
+    featuredItemsAriaLabel?: string;
     items?: GlobalNavItems;
     language?: string;
     zIndex?: number;
@@ -44,6 +46,6 @@ export interface MainHeaderNavigationProps {
     notificationText?: string;
 }
 /** @visibleName MainHeaderNavigation */
-declare const MainHeaderNavigation: ({ businessMenuAriaLabel, categoryCollectionText, closeMainMenuAriaLabel, className, collapseSize, currentUrl, dnaLogoLinkAriaLabel, isLoggedIn, items, language, languageSelector, languageSelectorText, login, loginComponent, loginText, mainMenuAriaLabel, minicart, minicartAmount, minicartAmountLabel, minicartComponent, minicartText, nextJSLinkComponent, notificationText, openMainMenuAriaLabel, search, searchComponent, searchText, showLoginTooltip, showMinicart, zIndex, ...props }: MainHeaderNavigationProps) => React.JSX.Element;
+declare const MainHeaderNavigation: ({ backToPreviousCategoryLabel, businessMenuAriaLabel, categoryCollectionText, closeMainMenuAriaLabel, className, collapseSize, currentUrl, dnaLogoLinkAriaLabel, featuredItemsAriaLabel, isLoggedIn, items, language, languageSelector, languageSelectorText, login, loginComponent, loginText, mainMenuAriaLabel, minicart, minicartAmount, minicartAmountLabel, minicartComponent, minicartText, nextJSLinkComponent, notificationText, openMainMenuAriaLabel, search, searchComponent, searchText, showLoginTooltip, showMinicart, zIndex, ...props }: MainHeaderNavigationProps) => React.JSX.Element;
 /** @component */
 export default MainHeaderNavigation;

package/build/cjs/components/MainHeaderNavigation/MainHeaderNavigation.js

@@ -82,7 +82,7 @@ const PageOverlay = styledComponents.styled.div `
     width: 100%;
     height: 100%;
     background: ${theme.default.color.background.plum.default + theme.default.color.transparency.T10};
-    z-index: ${({ navZIndex }) => navZIndex - 1};
+    z-index: ${({ $navZIndex }) => $navZIndex - 1};
 `;
 const scrollThreshold = 82;
 const checkThreshold = (prevPos, currPos) => {
@@ -92,7 +92,7 @@ const checkThreshold = (prevPos, currPos) => {
     return currPos - prevPos > scrollThreshold;
 };
 const GlobalNavigationContainer = styledComponents.styled.header `
-    z-index: ${({ navZIndex }) => navZIndex};
+    z-index: ${({ $navZIndex }) => $navZIndex};
     position: sticky;
     top: 0;
     left: 0;
@@ -117,7 +117,7 @@ const NavigationWrapper = styledComponents.styled.div `
     gap: 0;
     background-color: ${theme.default.color.background.white.default};
     border-bottom: 1px solid ${theme.default.color.line.L04};
-    @media (min-width: ${p => p.collapseSize + 1}px) {
+    @media (min-width: ${p => p.$collapseSize + 1}px) {
         flex-wrap: nowrap;
         gap: 0 ${styledUtils.getMultipliedSize(theme.default.base.baseWidth, 1.5)};
     }
@@ -134,7 +134,7 @@ const initiateScrollToHeader = (componentRef) => {
 /** @visibleName MainHeaderNavigation */
 const MainHeaderNavigation = (_a) => {
     var _b, _c, _d;
-    var { businessMenuAriaLabel = 'Sivustot', categoryCollectionText = 'Muut kategoriat', closeMainMenuAriaLabel, className, collapseSize = 767, currentUrl = '', dnaLogoLinkAriaLabel, isLoggedIn = false, items = {}, language = 'fi', languageSelector = false, languageSelectorText = 'Vaihda kieltä', login = true, loginComponent, loginText = 'Kirjaudu', mainMenuAriaLabel = 'Päänavigaatio', minicart = true, minicartAmount = 0, minicartAmountLabel, minicartComponent = false, minicartText = 'Ostoskori', nextJSLinkComponent = false, notificationText = '', openMainMenuAriaLabel, search = true, searchComponent = false, searchText = 'Haku', showLoginTooltip = false, showMinicart = false, zIndex = 1030 } = _a, props = tslib.__rest(_a, ["businessMenuAriaLabel", "categoryCollectionText", "closeMainMenuAriaLabel", "className", "collapseSize", "currentUrl", "dnaLogoLinkAriaLabel", "isLoggedIn", "items", "language", "languageSelector", "languageSelectorText", "login", "loginComponent", "loginText", "mainMenuAriaLabel", "minicart", "minicartAmount", "minicartAmountLabel", "minicartComponent", "minicartText", "nextJSLinkComponent", "notificationText", "openMainMenuAriaLabel", "search", "searchComponent", "searchText", "showLoginTooltip", "showMinicart", "zIndex"]);
+    var { backToPreviousCategoryLabel = '', businessMenuAriaLabel = 'Sivustot', categoryCollectionText = 'Muut kategoriat', closeMainMenuAriaLabel, className, collapseSize = 767, currentUrl = '', dnaLogoLinkAriaLabel, featuredItemsAriaLabel = '', isLoggedIn = false, items = {}, language = 'fi', languageSelector = false, languageSelectorText = 'Vaihda kieltä', login = true, loginComponent, loginText = 'Kirjaudu', mainMenuAriaLabel = 'Päänavigaatio', minicart = true, minicartAmount = 0, minicartAmountLabel, minicartComponent = false, minicartText = 'Ostoskori', nextJSLinkComponent = false, notificationText = '', openMainMenuAriaLabel, search = true, searchComponent = false, searchText = 'Haku', showLoginTooltip = false, showMinicart = false, zIndex = 1030 } = _a, props = tslib.__rest(_a, ["backToPreviousCategoryLabel", "businessMenuAriaLabel", "categoryCollectionText", "closeMainMenuAriaLabel", "className", "collapseSize", "currentUrl", "dnaLogoLinkAriaLabel", "featuredItemsAriaLabel", "isLoggedIn", "items", "language", "languageSelector", "languageSelectorText", "login", "loginComponent", "loginText", "mainMenuAriaLabel", "minicart", "minicartAmount", "minicartAmountLabel", "minicartComponent", "minicartText", "nextJSLinkComponent", "notificationText", "openMainMenuAriaLabel", "search", "searchComponent", "searchText", "showLoginTooltip", "showMinicart", "zIndex"]);
     const { isMobile } = useWindowSize.default(collapseSize);
     const navigationEl = React.useRef(null);
     const key = ramda.prop('id');
@@ -238,10 +238,12 @@ const MainHeaderNavigation = (_a) => {
             previousValue = isMobile;
         }
         return {
+            backToPreviousCategoryLabel,
             categoryCollectionText,
             collapseSize,
             currentUrl,
             getBackLink,
+            featuredItemsAriaLabel,
             handleNavMenuClick,
             isLoggedIn,
             isMobileMenu: isMobile,
@@ -263,9 +265,11 @@ const MainHeaderNavigation = (_a) => {
             tooltipItems,
         };
     }, [
+        backToPreviousCategoryLabel,
         categoryCollectionText,
         collapseSize,
         currentUrl,
+        featuredItemsAriaLabel,
         isLoggedIn,
         isMobile,
         isMobileMenuOpen,
@@ -299,23 +303,23 @@ const MainHeaderNavigation = (_a) => {
         setIsMobileMenuOpen(!isMobileMenuOpen);
     };
     return (React__default.default.createElement(React__default.default.Fragment, null,
-        isPageOverlay && React__default.default.createElement(PageOverlay, { "data-testid": "navigation-overlay", navZIndex: zIndex }),
-        React__default.default.createElement(GlobalNavigationContainer, { className: className, collapseSize: collapseSize, "data-testid": "dna-main-header", navZIndex: zIndex, ref: navigationEl },
+        isPageOverlay && React__default.default.createElement(PageOverlay, { "data-testid": "navigation-overlay", "$navZIndex": zIndex }),
+        React__default.default.createElement(GlobalNavigationContainer, { className: className, "$collapseSize": collapseSize, "data-testid": "dna-main-header", "$navZIndex": zIndex, ref: navigationEl },
             React__default.default.createElement(NavContext.default.Provider, { value: navigationContext },
                 React__default.default.createElement(GlobalStyle, null),
                 !items.mainNavigation && notificationText && (React__default.default.createElement(Notification.default, { type: "info" }, notificationText)),
                 React__default.default.createElement(BusinessMenu.default, { ariaLabel: businessMenuAriaLabel, currentBusinessId: items.businessId, items: (_d = items.businessSelector) === null || _d === void 0 ? void 0 : _d.items, lang: language }),
-                React__default.default.createElement(NavigationWrapper, { collapseSize: collapseSize },
+                React__default.default.createElement(NavigationWrapper, { "$collapseSize": collapseSize },
                     React__default.default.createElement(globalNavStyles.LogoLink, { "data-testid": "dna-logo-link", href: currentBusinessSite === null || currentBusinessSite === void 0 ? void 0 : currentBusinessSite.urls[language], "aria-label": dnaLogoLinkAriaLabel },
                         React__default.default.createElement(DnaLogo.default, { size: navigation.headerLogoSize })),
-                    React__default.default.createElement(globalNavStyles.DesktopMenuContainer, { "aria-label": mainMenuAriaLabel, collapseSize: collapseSize },
+                    React__default.default.createElement(globalNavStyles.DesktopMenuContainer, { "aria-label": mainMenuAriaLabel, "$collapseSize": collapseSize },
                         React__default.default.createElement(DesktopMenu.default, null)),
-                    React__default.default.createElement(globalNavStyles.HeaderIconContainer, { collapseSize: collapseSize },
+                    React__default.default.createElement(globalNavStyles.HeaderIconContainer, { "$collapseSize": collapseSize },
                         languagesObject && languageSelector && (React__default.default.createElement(LanguageSelector.default, { currentLanguage: language, languagesObject: languagesObject, languageSelectorLabel: languageSelectorText })),
                         search && React__default.default.createElement(PageSearch.default, { searchLabel: searchText }),
                         minicart && (React__default.default.createElement(MinicartTooltip.default, { minicartAmount: minicartAmount, minicartAmountLabel: minicartAmountLabel !== null && minicartAmountLabel !== void 0 ? minicartAmountLabel : '', minicartLabel: minicartText, onCartButtonClick: props.onCartButtonClick })),
                         login && React__default.default.createElement(LoginTooltip.default, { loginLabel: loginText, isLogged: isLoggedIn }),
-                        React__default.default.createElement(MainNavTooltipMenu.IconContainer, { collapseSize: collapseSize, "data-testid": "header-mobile-menu-container" },
+                        React__default.default.createElement(MainNavTooltipMenu.IconContainer, { "$collapseSize": collapseSize, "data-testid": "header-mobile-menu-container" },
                             React__default.default.createElement(globalNavStyles.MobileMenuButton, { "aria-expanded": isMobileMenuOpen, "aria-label": isMobileMenuOpen
                                     ? closeMainMenuAriaLabel
                                     : openMainMenuAriaLabel, "data-testid": "header-mobile-menu-toggle", onClick: handleToggleClick }, isMobileMenuOpen ? React__default.default.createElement(icons.Close, null) : React__default.default.createElement(icons.Menu, null)))),

package/build/cjs/components/MainHeaderNavigation/context/NavContext.d.ts

@@ -1,9 +1,11 @@
 import type { ComponentType, Dispatch, ReactNode, SetStateAction } from 'react';
 import type { GlobalNavItems, MenuLevelItem, MenuStates, MenuTooltipItems, MobileMenuLevel } from '../types/globalNavProps';
 export interface NavContextProps {
+    backToPreviousCategoryLabel: string;
     categoryCollectionText: string;
     collapseSize: number;
     currentUrl: string;
+    featuredItemsAriaLabel: string;
     getBackLink: (menuElements: MobileMenuLevel, i: number) => MenuLevelItem;
     handleNavMenuClick: (id: string | null, level: string) => void;
     isLoggedIn: boolean;

package/build/cjs/components/MainHeaderNavigation/context/NavContext.js

@@ -5,9 +5,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var React = require('react');
 
 const NavContext = React.createContext({
-    categoryCollectionText: 'Muut kategoriat',
+    backToPreviousCategoryLabel: '',
+    categoryCollectionText: '',
     collapseSize: 767,
     currentUrl: '',
+    featuredItemsAriaLabel: '',
     getBackLink: () => ({
         id: '',
         pageIsLinkInDesktopNavigation: false,
@@ -20,7 +22,7 @@ const NavContext = React.createContext({
     isMobileMenu: false,
     isMobileMenuOpen: false,
     items: {},
-    lang: 'fi',
+    lang: '',
     level1Items: {
         level1: { id: '', pageIsLinkInDesktopNavigation: false, pages: [], titles: {}, urls: {} },
     },

package/build/cjs/components/MainHeaderNavigation/globalNavStyles.d.ts

@@ -1,24 +1,24 @@
 export declare const LogoLink: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<import("react").DetailedHTMLProps<import("react").AnchorHTMLAttributes<HTMLAnchorElement>, HTMLAnchorElement>, never>> & string;
 export declare const DesktopMenuContainer: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components/dist/types").Substitute<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLElement>, HTMLElement>, {
-    collapseSize: number;
+    $collapseSize: number;
 }>> & string;
 export declare const MobileMenuButton: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<import("react").DetailedHTMLProps<import("react").ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement>, never>> & string;
 export declare const HeaderIconContainer: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components/dist/types").Substitute<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, {
-    collapseSize: number;
+    $collapseSize: number;
 }>> & string;
 export declare const MenuItem: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components/dist/types").Substitute<import("react").DetailedHTMLProps<import("react").LiHTMLAttributes<HTMLLIElement>, HTMLLIElement>, {
-    isActive?: boolean;
-    isFeaturedItem?: boolean;
+    $isActive?: boolean;
+    $isFeaturedItem?: boolean;
 }>> & string;
 export declare const MenuLink: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components/dist/types").Substitute<import("react").DetailedHTMLProps<import("react").AnchorHTMLAttributes<HTMLAnchorElement>, HTMLAnchorElement>, {
-    isActive?: boolean;
+    $isActive?: boolean;
 }>> & string;
 export declare const MenuLinkWithChildren: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components/dist/types").Substitute<import("react").DetailedHTMLProps<import("react").AnchorHTMLAttributes<HTMLAnchorElement>, HTMLAnchorElement>, {
-    isOpen?: boolean;
+    $isOpen?: boolean;
 }>> & string;
 export declare const MenuList: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components/dist/types").Substitute<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLUListElement>, HTMLUListElement>, {
-    isInView?: boolean;
+    $isInView?: boolean;
 }>> & string;
 export declare const FeaturedBlock: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components/dist/types").Substitute<import("react").DetailedHTMLProps<import("react").LiHTMLAttributes<HTMLLIElement>, HTMLLIElement>, {
-    collapseSize: number;
+    $collapseSize: number;
 }>> & string;

package/build/cjs/components/MainHeaderNavigation/globalNavStyles.js

@@ -14,7 +14,7 @@ const DesktopMenuContainer = styledComponents.styled.nav `
     display: none;
     flex-direction: column;
     position: absolute;
-    @media (min-width: ${p => p.collapseSize + 1}px) {
+    @media (min-width: ${p => p.$collapseSize + 1}px) {
         position: initial;
         width: auto;
         max-width: unset;
@@ -38,7 +38,8 @@ const MobileMenuButton = styledComponents.styled.button `
     &:focus-visible {
         outline: 0;
         border-radius: ${theme.default.radius.s};
-        box-shadow: 0px 0px 0px 2px ${theme.default.color.focus.light},
+        box-shadow:
+            0px 0px 0px 2px ${theme.default.color.focus.light},
             0px 0px 0px 4px ${theme.default.color.focus.dark};
         color: ${theme.default.color.text.black};
     }
@@ -58,31 +59,32 @@ const HeaderIconContainer = styledComponents.styled.div `
         }
     }
     > div:last-child {
-        @media (min-width: ${p => p.collapseSize + 1}px) {
+        @media (min-width: ${p => p.$collapseSize + 1}px) {
             display: none;
         }
     }
-    @media (min-width: ${p => p.collapseSize + 1}px) {
+    @media (min-width: ${p => p.$collapseSize + 1}px) {
         gap: ${styledUtils.getMultipliedSize(theme.default.base.baseWidth, 2)};
     }
 `;
 const MenuItem = styledComponents.styled.li `
-    display: ${p => (p.isFeaturedItem ? 'grid' : 'flex')};
+    display: ${p => (p.$isFeaturedItem ? 'grid' : 'flex')};
     align-items: center;
-    grid-template-columns: ${p => (p.isFeaturedItem ? '1fr 1fr' : '1fr')};
+    grid-template-columns: ${p => (p.$isFeaturedItem ? '1fr 1fr' : '1fr')};
     & > a {
         padding: ${styledUtils.getMultipliedSize(theme.default.base.baseHeight, 0.5)}
             ${styledUtils.getMultipliedSize(theme.default.base.baseWidth, 3)};
     }
     > button,
     > a {
-        color: ${p => (p.isActive ? theme.default.color.text.pink : theme.default.color.text.black)};
-        justify-content: ${p => (p.isFeaturedItem ? 'flex-start' : 'space-between')};
+        color: ${p => (p.$isActive ? theme.default.color.text.pink : theme.default.color.text.black)};
+        justify-content: ${p => (p.$isFeaturedItem ? 'flex-start' : 'space-between')};
         font-size: ${theme.default.fontSize.s};
         &:focus-visible {
             outline: 0;
             border-radius: ${theme.default.radius.s};
-            box-shadow: 0px 0px 0px 2px ${theme.default.color.focus.light},
+            box-shadow:
+                0px 0px 0px 2px ${theme.default.color.focus.light},
                 0px 0px 0px 4px ${theme.default.color.focus.dark};
         }
         ${styledUtils.media.xl `
@@ -93,7 +95,7 @@ const MenuItem = styledComponents.styled.li `
 const MenuLink = styledComponents.styled.a `
     overflow: visible;
     text-decoration: none;
-    color: ${p => (p.isActive ? theme.default.color.text.pink : theme.default.color.text.black)};
+    color: ${p => (p.$isActive ? theme.default.color.text.pink : theme.default.color.text.black)};
     > svg {
             fill: ${theme.default.color.text.pink};
             height: ${styledUtils.getMultipliedSize(theme.default.base.baseHeight, 2)};
@@ -106,9 +108,9 @@ const MenuLinkWithChildren = styledComponents.styled.a `
     display: block;
     font-family: inherit;
     white-space: normal;
-    color: ${p => (p.isOpen ? theme.default.color.text.pink : theme.default.color.default.black)};
+    color: ${p => (p.$isOpen ? theme.default.color.text.pink : theme.default.color.default.black)};
     > svg {
-            transform: rotate( ${p => (p.isOpen ? '270deg' : '90deg')});
+            transform: rotate( ${p => (p.$isOpen ? '270deg' : '90deg')});
             transition: transform .2s ease-in-out;
         }
     }
@@ -118,7 +120,7 @@ const MenuList = styledComponents.styled.ul `
     display: flex;
     flex-direction: row;
     gap: ${styledUtils.getMultipliedSize(theme.default.base.baseHeight, 1.5)};
-    max-height: ${p => (typeof p.isInView !== 'boolean' || p.isInView ? 'auto' : '5px')};
+    max-height: ${p => (typeof p.$isInView !== 'boolean' || p.$isInView ? 'auto' : '5px')};
     margin: 0;
     padding: 0;
     background-color: ${theme.default.color.background.white};
@@ -143,12 +145,9 @@ const MenuList = styledComponents.styled.ul `
 const FeaturedBlock = styledComponents.styled.li `
     background-color: ${theme.default.color.background.sand.E01};
     padding: ${styledUtils.getMultipliedSize(theme.default.base.baseHeight, 1)};
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    font-weight: ${theme.default.fontWeight.bold};
-    grid-column: 4;
-    grid-row: 1/4;
-    @media (min-width: ${p => p.collapseSize + 1}px) {
+    list-style: none;
+
+    @media (min-width: ${p => p.$collapseSize + 1}px) {
         ${common.default({ elevation: 'high' })};
         border-radius: 0
         border-width: 0 0 0 1px;
@@ -157,11 +156,17 @@ const FeaturedBlock = styledComponents.styled.li `
             ${styledUtils.getMultipliedSize(theme.default.base.baseWidth, 2)}
             ${styledUtils.getMultipliedSize(theme.default.base.baseHeight, 2)}
             ${styledUtils.getMultipliedSize(theme.default.base.baseWidth, 3)};
-        display: flex;
-        flex-direction: column;
-        gap: ${styledUtils.getMultipliedSize(theme.default.base.baseHeight, 1.5)};
-        align-items: stretch;
-        justify-content: flex-start;
+    }
+    section {
+        display: grid;
+        grid-template-columns: 1fr 1fr;
+        @media (min-width: ${p => p.$collapseSize + 1}px) {
+            display: flex;
+            flex-direction: column;
+            gap: ${styledUtils.getMultipliedSize(theme.default.base.baseHeight, 1.5)};
+            align-items: stretch;
+            justify-content: flex-start;
+        }
     }
     a {
         font-weight: ${theme.default.fontWeight.bold};

package/build/cjs/components/Notification/Notification.js

@@ -53,7 +53,8 @@ const ButtonCloseStyled = styledComponents.styled(ButtonClose.default) `
 
     &:focus-visible {
         outline: none;
-        box-shadow: 0px 0px 0px 2px ${theme.default.color.focus.light},
+        box-shadow:
+            0px 0px 0px 2px ${theme.default.color.focus.light},
             0px 0px 0px 4px ${theme.default.color.focus.dark};
     }
 `;

package/build/cjs/components/Pill/Pill.js

@@ -76,7 +76,8 @@ const Label = styledComponents.styled.label `
 
     &:focus-within, *:focus > & {
         outline: none;
-        box-shadow: 0px 0px 0px 2px ${theme.default.color.focus.light},
+        box-shadow:
+            0px 0px 0px 2px ${theme.default.color.focus.light},
             0px 0px 0px 4px ${theme.default.color.focus.dark};
     }
 

package/build/cjs/components/RadioButton/RadioButton.js

@@ -79,7 +79,8 @@ const Input = styledComponents.styled.input `
 
     &:focus-visible {
         outline: none;
-        box-shadow: 0px 0px 0px 2px ${theme.default.color.focus.light},
+        box-shadow:
+            0px 0px 0px 2px ${theme.default.color.focus.light},
             0px 0px 0px 4px ${theme.default.color.focus.dark};
     }
 `;
@@ -87,7 +88,7 @@ const Input = styledComponents.styled.input `
 const RadioButtonComponent = (_a) => {
     var { 'data-testid': dataTestId } = _a, props = tslib.__rest(_a, ['data-testid']);
     return (React__default.default.createElement(Container, { className: props.className, "data-testid": dataTestId },
-        React__default.default.createElement(Input, { id: props.id, name: props.name, type: "radio", checked: props.checked, value: props.value, disabled: props.disabled, onChange: props.onChange, "data-testid": dataTestId && `${dataTestId}-input` }),
+        React__default.default.createElement(Input, { id: props.id, name: props.name, type: "radio", checked: props.checked, value: props.value, disabled: props.disabled, onChange: props.onChange, "data-checked": Boolean(props.checked), "data-testid": dataTestId && `${dataTestId}-input` }),
         props.label && (React__default.default.createElement("label", { htmlFor: props.id, "data-testid": dataTestId && `${dataTestId}-label` }, props.label))));
 };
 const StyledFieldset = styledComponents.styled.fieldset `
@@ -104,7 +105,7 @@ const RadioButtonGroup = ({ label, description, groupName, value, onChange, id,
     const descriptionId = `${baseId}-description`;
     const combinedDescribedBy = [description ? descriptionId : undefined].filter(Boolean).join(' ');
     const content = children ||
-        (options === null || options === void 0 ? void 0 : options.map(option => (React__default.default.createElement(RadioButtonComponent, { key: option.id, id: option.id, name: groupName, value: option.value, label: option.label, disabled: option.disabled, checked: value === option.value, onChange: onChange, className: option.className, "data-testid": option['data-testid'], "data-checked": value === option.value }))));
+        (options === null || options === void 0 ? void 0 : options.map(option => (React__default.default.createElement(RadioButtonComponent, { key: option.id, id: option.id, name: groupName, value: option.value, label: option.label, disabled: option.disabled, checked: value === option.value, onChange: onChange, className: option.className, "data-testid": option['data-testid'] }))));
     const Wrapper = isFieldset ? StyledFieldset : 'div';
     const renderLabel = () => {
         if (!label)

package/build/cjs/components/SecondaryNavigation/SecondaryNavigation.js

@@ -76,7 +76,9 @@ const SecondaryNavigationList = styledComponents.styled.ul `
     overflow: hidden;
     display: flex;
     flex-direction: column;
-    transition: max-height 0.2s ease-in-out, border-bottom 0.2s linear;
+    transition:
+        max-height 0.2s ease-in-out,
+        border-bottom 0.2s linear;
     background-color: ${({ isOpen }) => isOpen ? theme.default.color.background.white.default : 'transparent'};
     max-height: ${({ isOpen }) => (isOpen ? '500vh' : '0')};
     border-bottom: ${({ isOpen }) => (isOpen ? `1px solid ${theme.default.color.line.L03}` : 'none')};

package/build/cjs/components/Switch/Switch.js

@@ -113,9 +113,8 @@ const Switch = (_a) => {
             onChange(!props.isChecked);
         }
     };
-    const accessibleLabel = props.label ? undefined : ariaLabel || 'Toggle switch';
     return (React__namespace.createElement(Container, { className: props.className, "data-testid": dataTestId },
-        React__namespace.createElement(Checkbox, { id: props.id, name: props.name, checked: Boolean(props.isChecked), "aria-label": accessibleLabel, disabled: props.disabled, onChange: handleChange, role: "switch", type: "checkbox", "data-checked": Boolean(props.isChecked) }),
+        React__namespace.createElement(Checkbox, { id: props.id, name: props.name, checked: Boolean(props.isChecked), "aria-label": ariaLabel, disabled: props.disabled, onChange: handleChange, role: "switch", type: "checkbox", "data-checked": Boolean(props.isChecked) }),
         React__namespace.createElement(LabelWrapper, { htmlFor: props.id },
             React__namespace.createElement(Rail, { "$isChecked": props.isChecked },
                 React__namespace.createElement(Button, { "$isChecked": props.isChecked })),

package/build/cjs/components/Tooltip/Tooltip.js

@@ -33,7 +33,8 @@ const Helper = styledComponents.styled.button `
 
     &:focus-visible {
         outline: none;
-        box-shadow: 0px 0px 0px 2px ${theme.default.color.focus.light},
+        box-shadow:
+            0px 0px 0px 2px ${theme.default.color.focus.light},
             0px 0px 0px 4px ${theme.default.color.focus.dark};
         border-radius: 100%;
     }