@dnanpm/styleguide 1.8.1 → 2.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/cjs/components/Accordion/Accordion.d.ts +50 -0
- package/build/cjs/components/Accordion/Accordion.js +52 -0
- package/build/cjs/components/Accordion/AccordionItem.d.ts +30 -0
- package/build/cjs/components/Accordion/AccordionItem.js +77 -0
- package/build/cjs/components/AmountSelector/AmountSelector.js +5 -6
- package/build/cjs/components/Buttons/ButtonBasicStyles.d.ts +37 -30
- package/build/cjs/components/Buttons/ButtonBasicStyles.js +10 -14
- package/build/cjs/components/Buttons/ButtonDefault.js +6 -2
- package/build/cjs/components/Buttons/ButtonIconPrimaryStyles.d.ts +37 -30
- package/build/cjs/components/Buttons/ButtonIconStyles.d.ts +37 -30
- package/build/cjs/components/Buttons/ButtonPrimary.js +6 -2
- package/build/cjs/components/Buttons/ButtonPrimaryStyles.d.ts +37 -30
- package/build/cjs/components/Buttons/ButtonSecondary.js +7 -3
- package/build/cjs/components/Buttons/ButtonSecondaryStyles.d.ts +37 -30
- package/build/cjs/components/Buttons/ButtonTertiary.js +7 -3
- package/build/cjs/components/Buttons/ButtonTertiaryStyles.d.ts +37 -30
- package/build/cjs/components/Buttons/CloseButton.d.ts +37 -30
- package/build/cjs/components/Card/Card.js +4 -2
- package/build/cjs/components/Card/CardRow.js +3 -3
- package/build/cjs/components/Checkbox/Checkbox.d.ts +38 -12
- package/build/cjs/components/Checkbox/Checkbox.js +37 -70
- package/build/cjs/components/DnaLogo/DnaLogo.d.ts +37 -40
- package/build/cjs/components/Footer/Components/FooterComponents.js +3 -2
- package/build/cjs/components/Helper/Helper.js +2 -1
- package/build/cjs/components/Icon/Icon.d.ts +39 -30
- package/build/cjs/components/Icon/Icons.d.ts +1 -4
- package/build/cjs/components/Icon/Icons.js +3 -7
- package/build/cjs/components/Input/Input.d.ts +102 -13
- package/build/cjs/components/Input/Input.js +57 -58
- package/build/cjs/components/Label/Label.js +2 -3
- package/build/cjs/components/LabelText/LabelText.d.ts +38 -30
- package/build/cjs/components/LabelText/LabelText.js +1 -1
- package/build/cjs/components/MainNavigation/ChildComponents/BusinessMenu.js +4 -10
- package/build/cjs/components/MainNavigation/ChildComponents/DesktopMenu.js +18 -12
- package/build/cjs/components/MainNavigation/ChildComponents/HeaderNavigationElements.d.ts +37 -30
- package/build/cjs/components/MainNavigation/ChildComponents/LanguageSelector.js +2 -2
- package/build/cjs/components/MainNavigation/ChildComponents/LinkModifier.js +2 -2
- package/build/cjs/components/MainNavigation/ChildComponents/MainNavTooltipMenuExportedStyles.d.ts +37 -30
- package/build/cjs/components/MainNavigation/ChildComponents/MainNavTooltipMenuExportedStyles.js +1 -4
- package/build/cjs/components/MainNavigation/ChildComponents/MobileMenu.js +1 -1
- package/build/cjs/components/MainNavigation/ChildComponents/Ribbon.js +1 -1
- package/build/cjs/components/MainNavigation/MainNavigation.js +1 -17
- package/build/cjs/components/MainNavigation/globalNavStyles.d.ts +148 -120
- package/build/cjs/components/Notification/Notification.d.ts +36 -17
- package/build/cjs/components/Notification/Notification.js +25 -48
- package/build/cjs/components/NotificationBadge/NotificationBadge.d.ts +37 -30
- package/build/cjs/components/NotificationBadge/NotificationBadge.js +1 -1
- package/build/cjs/components/PixelLoader/PixelLoaderStyles.d.ts +74 -60
- package/build/cjs/components/ProgressIndicator/ProgressIndicator.js +3 -3
- package/build/cjs/components/RadioButton/RadioButton.d.ts +33 -17
- package/build/cjs/components/RadioButton/RadioButton.js +12 -57
- package/build/cjs/components/ReadMore/ReadMore.js +2 -7
- package/build/cjs/components/Ribbon/Ribbon.d.ts +57 -0
- package/build/cjs/components/Ribbon/Ribbon.js +80 -0
- package/build/cjs/components/Search/Search.js +2 -1
- package/build/cjs/components/SecondaryNavigation/SecondaryNavigation.js +2 -2
- package/build/cjs/components/Selectbox/Selectbox.d.ts +102 -13
- package/build/cjs/components/Selectbox/Selectbox.js +40 -49
- package/build/cjs/components/Tabs/Tab.d.ts +37 -30
- package/build/cjs/components/Tabs/Tab.js +3 -2
- package/build/cjs/components/Tabs/Tabs.d.ts +40 -30
- package/build/cjs/components/Textarea/Textarea.js +4 -3
- package/build/cjs/components/Tooltip/Tooltip.d.ts +37 -30
- package/build/cjs/components/TooltipMenu/ChildComponents/TooltipMenuExportedStyles.d.ts +74 -60
- package/build/cjs/components/index.d.ts +4 -1
- package/build/cjs/hooks/useElementDimensions.d.ts +5 -0
- package/build/cjs/hooks/useElementDimensions.js +37 -0
- package/build/cjs/index.js +6 -0
- package/build/cjs/themes/globalStyles.d.ts +174 -60
- package/build/cjs/themes/globalStyles.js +132 -142
- package/build/cjs/themes/styled.d.ts +259 -210
- package/build/cjs/themes/theme.d.ts +37 -30
- package/build/cjs/themes/themeComponents/buttons.d.ts +1 -6
- package/build/cjs/themes/themeComponents/buttons.js +1 -6
- package/build/cjs/themes/themeComponents/fontFamily.d.ts +3 -1
- package/build/cjs/themes/themeComponents/fontFamily.js +3 -1
- package/build/cjs/themes/themeComponents/fontSize.d.ts +18 -15
- package/build/cjs/themes/themeComponents/fontSize.js +20 -14
- package/build/cjs/themes/themeComponents/lineHeight.d.ts +19 -12
- package/build/cjs/themes/themeComponents/lineHeight.js +21 -11
- package/build/es/components/Accordion/Accordion.d.ts +50 -0
- package/build/es/components/Accordion/Accordion.js +44 -0
- package/build/es/components/Accordion/AccordionItem.d.ts +30 -0
- package/build/es/components/Accordion/AccordionItem.js +68 -0
- package/build/es/components/AmountSelector/AmountSelector.js +5 -6
- package/build/es/components/Buttons/ButtonBasicStyles.d.ts +37 -30
- package/build/es/components/Buttons/ButtonBasicStyles.js +10 -14
- package/build/es/components/Buttons/ButtonDefault.js +6 -2
- package/build/es/components/Buttons/ButtonIconPrimaryStyles.d.ts +37 -30
- package/build/es/components/Buttons/ButtonIconStyles.d.ts +37 -30
- package/build/es/components/Buttons/ButtonPrimary.js +6 -2
- package/build/es/components/Buttons/ButtonPrimaryStyles.d.ts +37 -30
- package/build/es/components/Buttons/ButtonSecondary.js +7 -3
- package/build/es/components/Buttons/ButtonSecondaryStyles.d.ts +37 -30
- package/build/es/components/Buttons/ButtonTertiary.js +7 -3
- package/build/es/components/Buttons/ButtonTertiaryStyles.d.ts +37 -30
- package/build/es/components/Buttons/CloseButton.d.ts +37 -30
- package/build/es/components/Card/Card.js +4 -2
- package/build/es/components/Card/CardRow.js +3 -3
- package/build/es/components/Checkbox/Checkbox.d.ts +38 -12
- package/build/es/components/Checkbox/Checkbox.js +39 -72
- package/build/es/components/DnaLogo/DnaLogo.d.ts +37 -40
- package/build/es/components/Footer/Components/FooterComponents.js +3 -2
- package/build/es/components/Helper/Helper.js +2 -1
- package/build/es/components/Icon/Icon.d.ts +39 -30
- package/build/es/components/Icon/Icons.d.ts +1 -4
- package/build/es/components/Icon/Icons.js +3 -7
- package/build/es/components/Input/Input.d.ts +102 -13
- package/build/es/components/Input/Input.js +57 -58
- package/build/es/components/Label/Label.js +2 -3
- package/build/es/components/LabelText/LabelText.d.ts +38 -30
- package/build/es/components/LabelText/LabelText.js +1 -1
- package/build/es/components/MainNavigation/ChildComponents/BusinessMenu.js +4 -10
- package/build/es/components/MainNavigation/ChildComponents/DesktopMenu.js +18 -12
- package/build/es/components/MainNavigation/ChildComponents/HeaderNavigationElements.d.ts +37 -30
- package/build/es/components/MainNavigation/ChildComponents/LanguageSelector.js +2 -2
- package/build/es/components/MainNavigation/ChildComponents/LinkModifier.js +2 -2
- package/build/es/components/MainNavigation/ChildComponents/MainNavTooltipMenuExportedStyles.d.ts +37 -30
- package/build/es/components/MainNavigation/ChildComponents/MainNavTooltipMenuExportedStyles.js +2 -5
- package/build/es/components/MainNavigation/ChildComponents/MobileMenu.js +1 -1
- package/build/es/components/MainNavigation/ChildComponents/Ribbon.js +1 -1
- package/build/es/components/MainNavigation/MainNavigation.js +2 -17
- package/build/es/components/MainNavigation/globalNavStyles.d.ts +148 -120
- package/build/es/components/Notification/Notification.d.ts +36 -17
- package/build/es/components/Notification/Notification.js +25 -48
- package/build/es/components/NotificationBadge/NotificationBadge.d.ts +37 -30
- package/build/es/components/NotificationBadge/NotificationBadge.js +1 -1
- package/build/es/components/PixelLoader/PixelLoaderStyles.d.ts +74 -60
- package/build/es/components/ProgressIndicator/ProgressIndicator.js +3 -3
- package/build/es/components/RadioButton/RadioButton.d.ts +33 -17
- package/build/es/components/RadioButton/RadioButton.js +12 -57
- package/build/es/components/ReadMore/ReadMore.js +2 -7
- package/build/es/components/Ribbon/Ribbon.d.ts +57 -0
- package/build/es/components/Ribbon/Ribbon.js +71 -0
- package/build/es/components/Search/Search.js +2 -1
- package/build/es/components/SecondaryNavigation/SecondaryNavigation.js +2 -2
- package/build/es/components/Selectbox/Selectbox.d.ts +102 -13
- package/build/es/components/Selectbox/Selectbox.js +40 -49
- package/build/es/components/Tabs/Tab.d.ts +37 -30
- package/build/es/components/Tabs/Tab.js +3 -2
- package/build/es/components/Tabs/Tabs.d.ts +40 -30
- package/build/es/components/Textarea/Textarea.js +4 -3
- package/build/es/components/Tooltip/Tooltip.d.ts +37 -30
- package/build/es/components/TooltipMenu/ChildComponents/TooltipMenuExportedStyles.d.ts +74 -60
- package/build/es/components/index.d.ts +4 -1
- package/build/es/hooks/useElementDimensions.d.ts +5 -0
- package/build/es/hooks/useElementDimensions.js +33 -0
- package/build/es/index.js +3 -0
- package/build/es/themes/globalStyles.d.ts +174 -60
- package/build/es/themes/globalStyles.js +134 -145
- package/build/es/themes/styled.d.ts +259 -210
- package/build/es/themes/theme.d.ts +37 -30
- package/build/es/themes/themeComponents/buttons.d.ts +1 -6
- package/build/es/themes/themeComponents/buttons.js +1 -6
- package/build/es/themes/themeComponents/fontFamily.d.ts +3 -1
- package/build/es/themes/themeComponents/fontFamily.js +3 -1
- package/build/es/themes/themeComponents/fontSize.d.ts +18 -15
- package/build/es/themes/themeComponents/fontSize.js +20 -14
- package/build/es/themes/themeComponents/lineHeight.d.ts +19 -12
- package/build/es/themes/themeComponents/lineHeight.js +21 -11
- package/package.json +3 -4
|
@@ -12,12 +12,7 @@ export declare const LabelText: import("styled-components").StyledComponent<"lab
|
|
|
12
12
|
};
|
|
13
13
|
breakpoints: import("../../themes/themeComponents/breakpoints").ViewBreakpoints;
|
|
14
14
|
button: {
|
|
15
|
-
|
|
16
|
-
buttonPadding: string;
|
|
17
|
-
smallButtonPadding: string;
|
|
18
|
-
buttonLineHeight: string;
|
|
19
|
-
buttonWidth: string;
|
|
20
|
-
buttonSmallWidth: string;
|
|
15
|
+
border: string;
|
|
21
16
|
};
|
|
22
17
|
color: {
|
|
23
18
|
black: string;
|
|
@@ -48,22 +43,27 @@ export declare const LabelText: import("styled-components").StyledComponent<"lab
|
|
|
48
43
|
gray5: string;
|
|
49
44
|
};
|
|
50
45
|
fontFamily: {
|
|
51
|
-
|
|
46
|
+
default: string;
|
|
47
|
+
heading: string;
|
|
48
|
+
numerals: string;
|
|
52
49
|
};
|
|
53
50
|
fontSize: {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
51
|
+
default: string;
|
|
52
|
+
xl: string;
|
|
53
|
+
l: string;
|
|
54
|
+
s: string;
|
|
55
|
+
xs: string;
|
|
56
|
+
h1XL: string;
|
|
57
|
+
h1L: string;
|
|
58
|
+
h1M: string;
|
|
59
|
+
h1S: string;
|
|
60
|
+
h2M: string;
|
|
61
|
+
h2S: string;
|
|
62
|
+
h3: string;
|
|
63
|
+
h4: string;
|
|
64
|
+
h5: string;
|
|
65
|
+
h1: string;
|
|
66
|
+
h2: string;
|
|
67
67
|
};
|
|
68
68
|
fontWeight: {
|
|
69
69
|
book: number;
|
|
@@ -79,16 +79,24 @@ export declare const LabelText: import("styled-components").StyledComponent<"lab
|
|
|
79
79
|
gutter: string;
|
|
80
80
|
};
|
|
81
81
|
lineHeight: {
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
82
|
+
default: string;
|
|
83
|
+
xl: string;
|
|
84
|
+
s: string;
|
|
85
|
+
/** @visibleName Label Text */
|
|
86
|
+
xs: string;
|
|
87
|
+
xxs: string;
|
|
88
|
+
auto: string;
|
|
89
|
+
h1XL: string;
|
|
90
|
+
h1L: string;
|
|
91
|
+
h1M: string;
|
|
92
|
+
h1S: string;
|
|
93
|
+
h2M: string;
|
|
94
|
+
h2S: string;
|
|
95
|
+
h3: string;
|
|
96
|
+
h4: string;
|
|
97
|
+
h5: string;
|
|
98
|
+
h1: string;
|
|
99
|
+
h2: string;
|
|
92
100
|
};
|
|
93
101
|
media: Record<string | number, (l: TemplateStringsArray, ...p: any[]) => string>;
|
|
94
102
|
}, {}, never>;
|
|
@@ -7,7 +7,7 @@ var styledUtils = require('../../utils/styledUtils.js');
|
|
|
7
7
|
|
|
8
8
|
/** @visibleName Label Text */
|
|
9
9
|
const LabelText = styled['default'].label(({ theme, htmlFor }) => ({
|
|
10
|
-
fontSize: theme.fontSize.
|
|
10
|
+
fontSize: theme.fontSize.default,
|
|
11
11
|
display: 'block',
|
|
12
12
|
marginBottom: styledUtils.getDividedSize(theme.base.baseWidth, 2),
|
|
13
13
|
cursor: htmlFor ? 'pointer' : 'default',
|
|
@@ -35,29 +35,23 @@ const BusinessMenuList = styled['default'].ul `
|
|
|
35
35
|
margin: ${({ isMobileMenu }) => (isMobileMenu ? '1rem 0' : '0 0.325rem')};
|
|
36
36
|
padding: 0;
|
|
37
37
|
background-color: ${p => p.theme.color.white};
|
|
38
|
-
font-size: ${p => p.theme.fontSize.
|
|
38
|
+
font-size: ${p => p.theme.fontSize.s};
|
|
39
39
|
height: 100%;
|
|
40
40
|
`;
|
|
41
41
|
const BusinessMenu = () => {
|
|
42
|
-
const { items: data, lang: language, isMobileMenu, resetMenuEvents
|
|
42
|
+
const { items: data, lang: language, isMobileMenu, resetMenuEvents } = React.useContext(NavContext['default']);
|
|
43
43
|
const ref = React.useRef(null);
|
|
44
44
|
if (!data.businessId || (!data.businessSelector && data.businessSelector.items.length > 0)) {
|
|
45
45
|
return React__default['default'].createElement(React__default['default'].Fragment, null);
|
|
46
46
|
}
|
|
47
47
|
const currentBusinessId = data.businessId;
|
|
48
48
|
const businessMenuItems = data.businessSelector.items;
|
|
49
|
-
const getTabIndex = () => {
|
|
50
|
-
if ((scrollPosition && scrollPosition > 0) || !isMobileMenu) {
|
|
51
|
-
return -1;
|
|
52
|
-
}
|
|
53
|
-
return undefined;
|
|
54
|
-
};
|
|
55
49
|
if (!businessMenuItems.length) {
|
|
56
50
|
return React__default['default'].createElement(React__default['default'].Fragment, null);
|
|
57
51
|
}
|
|
58
52
|
return (React__default['default'].createElement(BusinessMenuList, { isMobileMenu: isMobileMenu, ref: ref, role: "menubar", "aria-hidden": "false", "data-testid": "business-menu-ul" }, businessMenuItems.map((item, index) => {
|
|
59
|
-
return (React__default['default'].createElement(BusinessMenuItem, { className: "menu-item", key: item.businessId, "data-testid": `business-menu-selection-item-${index + 1}
|
|
60
|
-
React__default['default'].createElement(BusinessMenuLink, { className: "menu-link", href: item.urls[language], onClick: resetMenuEvents,
|
|
53
|
+
return (React__default['default'].createElement(BusinessMenuItem, { className: "menu-item", key: item.businessId, "data-testid": `business-menu-selection-item-${index + 1}`, role: "none" },
|
|
54
|
+
React__default['default'].createElement(BusinessMenuLink, { className: "menu-link", href: item.urls[language], onClick: resetMenuEvents, isActive: item.businessId === currentBusinessId, isMobileMenu: isMobileMenu, role: "menuitem" }, item.titles[language])));
|
|
61
55
|
})));
|
|
62
56
|
};
|
|
63
57
|
|
|
@@ -43,7 +43,7 @@ const SubMenuListRight = styled['default'].ul `
|
|
|
43
43
|
: 'none'};
|
|
44
44
|
${({ menuStates }) => menuStates.level2 && menuStates.animate2 ? fadeRightAnimation : noAnimation};
|
|
45
45
|
top: -${p => styledUtils.getMultipliedSize(p.theme.base.baseHeight, 1)};
|
|
46
|
-
margin:
|
|
46
|
+
margin: 0;
|
|
47
47
|
margin-top: -2px;
|
|
48
48
|
margin-left: ${p => styledUtils.getMultipliedSize(p.theme.base.baseHeight, 1)};
|
|
49
49
|
padding: ${p => styledUtils.getMultipliedSize(p.theme.base.baseHeight, 1)};
|
|
@@ -95,9 +95,9 @@ const DesktopMenuList = styled['default'](globalNavStyles.MenuList) `
|
|
|
95
95
|
}
|
|
96
96
|
a,
|
|
97
97
|
button {
|
|
98
|
-
font-size: ${theme['default'].fontSize.
|
|
98
|
+
font-size: ${theme['default'].fontSize.s};
|
|
99
99
|
${() => styledUtils.media.xl `
|
|
100
|
-
font-size: ${theme['default'].fontSize.
|
|
100
|
+
font-size: ${theme['default'].fontSize.default};
|
|
101
101
|
`};
|
|
102
102
|
}
|
|
103
103
|
margin-top: -2px;
|
|
@@ -117,6 +117,7 @@ const DesktopMenuItem = styled['default'](globalNavStyles.MenuItem) `
|
|
|
117
117
|
}
|
|
118
118
|
> a,
|
|
119
119
|
> button {
|
|
120
|
+
width: auto;
|
|
120
121
|
display: flex;
|
|
121
122
|
line-height: 1rem;
|
|
122
123
|
padding: 0.75rem 0;
|
|
@@ -135,6 +136,10 @@ const DesktopMenuItem = styled['default'](globalNavStyles.MenuItem) `
|
|
|
135
136
|
border-bottom: 1px solid
|
|
136
137
|
${p => (p && p.isActive ? p.theme.color.hotPink : 'transparent')};
|
|
137
138
|
}
|
|
139
|
+
&:hover,
|
|
140
|
+
&:focus {
|
|
141
|
+
border-bottom: 3px solid ${p => p.theme.color.white};
|
|
142
|
+
}
|
|
138
143
|
}
|
|
139
144
|
&:hover,
|
|
140
145
|
&:focus {
|
|
@@ -167,7 +172,7 @@ const SubMenuList = styled['default'].ul `
|
|
|
167
172
|
width: ${navigation.subMenuWidthXl};
|
|
168
173
|
`};
|
|
169
174
|
li {
|
|
170
|
-
margin:
|
|
175
|
+
margin: 0;
|
|
171
176
|
padding: 0;
|
|
172
177
|
a,
|
|
173
178
|
button {
|
|
@@ -201,13 +206,13 @@ const SubMenuLevel1 = ({ menuItem }) => {
|
|
|
201
206
|
return (React__default['default'].createElement(SubMenuList, { role: "menu", "aria-hidden": false, menuStates: menuLevel, navItemId: menuItem.id, "data-testid": "desktop-nav-menu-ul-level-2", navZIndex: navZIndex }, menuItem.pages.map((element, index) => {
|
|
202
207
|
const menuUrl = element.urls[language];
|
|
203
208
|
if (element.pages.length) {
|
|
204
|
-
return (React__default['default'].createElement(SubMenuItem, { key: element.id, role: "
|
|
205
|
-
React__default['default'].createElement(globalNavStyles.MenuLinkWithChildren, { isActive: menuLevel.level2 === element.id, isHighlighted: LinkModifier.isSelected(currentUrl, menuUrl), onClick: menuClick(element), role: "menuitem", "data-testid": "menu-button-with-children" },
|
|
209
|
+
return (React__default['default'].createElement(SubMenuItem, { key: element.id, role: "none", "data-testid": `desktop-nav-item-level-2-link-${index + 1}` },
|
|
210
|
+
React__default['default'].createElement(globalNavStyles.MenuLinkWithChildren, { isActive: menuLevel.level2 === element.id, isHighlighted: LinkModifier.isSelected(currentUrl, menuUrl), onClick: menuClick(element), role: "menuitem", "aria-haspopup": "true", "data-testid": "menu-button-with-children" },
|
|
206
211
|
React__default['default'].createElement("span", null, element.titles[language]),
|
|
207
212
|
React__default['default'].createElement(Icon['default'], { name: "chevronRight", size: "0.625rem" })),
|
|
208
213
|
React__default['default'].createElement(SubMenuLevel2, { menuItem: element })));
|
|
209
214
|
}
|
|
210
|
-
return (React__default['default'].createElement(SubMenuItem, { key: element.id, isHighlighted: LinkModifier.isSelected(currentUrl, menuUrl, true), role: "
|
|
215
|
+
return (React__default['default'].createElement(SubMenuItem, { key: element.id, isHighlighted: LinkModifier.isSelected(currentUrl, menuUrl, true), role: "none", "data-testid": `desktop-nav-item-level-2-link-${index + 1}` },
|
|
211
216
|
React__default['default'].createElement(LinkModifier['default'], { menuItem: element, tabIndex: false })));
|
|
212
217
|
})));
|
|
213
218
|
};
|
|
@@ -215,7 +220,7 @@ const SubMenuLevel2 = ({ menuItem }) => {
|
|
|
215
220
|
const { lang, menuLevel, currentUrl } = React.useContext(NavContext['default']);
|
|
216
221
|
return (React__default['default'].createElement(SubMenuListRight, { role: "menu", menuStates: menuLevel, navItemId: menuItem.id, "data-testid": "desktop-nav-menu-ul-level-3" }, menuItem.pages.map((item, index) => {
|
|
217
222
|
const menuUrl = item.urls[lang];
|
|
218
|
-
return (React__default['default'].createElement(SubMenuItem, { key: item.id, isHighlighted: LinkModifier.isSelected(currentUrl, menuUrl, true), role: "
|
|
223
|
+
return (React__default['default'].createElement(SubMenuItem, { key: item.id, isHighlighted: LinkModifier.isSelected(currentUrl, menuUrl, true), role: "none", "data-testid": `desktop-nav-item-level-3-link-${index + 1}` },
|
|
219
224
|
React__default['default'].createElement(LinkModifier['default'], { menuItem: item, tabIndex: false })));
|
|
220
225
|
})));
|
|
221
226
|
};
|
|
@@ -226,13 +231,13 @@ const MenuItemWithChildren = ({ menuItem, currentLevel }) => {
|
|
|
226
231
|
handleNavMenuClick(element.id, 'level1');
|
|
227
232
|
};
|
|
228
233
|
const menuUrl = menuItem.urls[language];
|
|
229
|
-
return (React__default['default'].createElement(DesktopMenuItem, { isActive: menuLevel.level1 === menuItem.id || LinkModifier.isSelected(currentUrl, menuUrl), role: "
|
|
230
|
-
React__default['default'].createElement(globalNavStyles.MenuLinkWithChildren, { onClick: menuClickMain(menuItem), role: "menuitem", "data-testid": "menu-button-with-children" },
|
|
234
|
+
return (React__default['default'].createElement(DesktopMenuItem, { isActive: menuLevel.level1 === menuItem.id || LinkModifier.isSelected(currentUrl, menuUrl), role: "none", "data-testid": `desktop-nav-item-level-1-link-${currentLevel + 1}` },
|
|
235
|
+
React__default['default'].createElement(globalNavStyles.MenuLinkWithChildren, { onClick: menuClickMain(menuItem), role: "menuitem", "aria-haspopup": "true", "data-testid": "menu-button-with-children" },
|
|
231
236
|
React__default['default'].createElement("span", null, menuItem.titles[language])),
|
|
232
237
|
React__default['default'].createElement(SubMenuLevel1, { menuItem: menuItem })));
|
|
233
238
|
};
|
|
234
239
|
const DesktopMenu = () => {
|
|
235
|
-
const { items: data, resetMenuEvents, menuLevel } = React.useContext(NavContext['default']);
|
|
240
|
+
const { items: data, lang: language, resetMenuEvents, menuLevel, currentUrl } = React.useContext(NavContext['default']);
|
|
236
241
|
const mainNavigation = data.mainNavigation && data.mainNavigation.pages ? data.mainNavigation.pages : [];
|
|
237
242
|
const ref = React.useRef(null);
|
|
238
243
|
useOutsideClick['default'](ref, () => {
|
|
@@ -248,7 +253,8 @@ const DesktopMenu = () => {
|
|
|
248
253
|
if (menuHasChildren) {
|
|
249
254
|
return (React__default['default'].createElement(MenuItemWithChildren, { menuItem: navElement, key: navElement.id, currentLevel: index }));
|
|
250
255
|
}
|
|
251
|
-
return (React__default['default'].createElement(
|
|
256
|
+
return (React__default['default'].createElement(DesktopMenuItem, { key: navElement.id, role: "none", "data-testid": `desktop-nav-item-level-1-link-${index + 1}`, isActive: menuLevel.level1 === navElement.id ||
|
|
257
|
+
LinkModifier.isSelected(currentUrl, navElement.urls[language]) },
|
|
252
258
|
React__default['default'].createElement(LinkModifier['default'], { menuItem: navElement, tabIndex: false })));
|
|
253
259
|
})));
|
|
254
260
|
};
|
|
@@ -12,12 +12,7 @@ export declare const IconContainer: import("styled-components").StyledComponent<
|
|
|
12
12
|
};
|
|
13
13
|
breakpoints: import("../../../themes/themeComponents/breakpoints").ViewBreakpoints;
|
|
14
14
|
button: {
|
|
15
|
-
|
|
16
|
-
buttonPadding: string;
|
|
17
|
-
smallButtonPadding: string;
|
|
18
|
-
buttonLineHeight: string;
|
|
19
|
-
buttonWidth: string;
|
|
20
|
-
buttonSmallWidth: string;
|
|
15
|
+
border: string;
|
|
21
16
|
};
|
|
22
17
|
color: {
|
|
23
18
|
black: string;
|
|
@@ -48,22 +43,27 @@ export declare const IconContainer: import("styled-components").StyledComponent<
|
|
|
48
43
|
gray5: string;
|
|
49
44
|
};
|
|
50
45
|
fontFamily: {
|
|
51
|
-
|
|
46
|
+
default: string;
|
|
47
|
+
heading: string;
|
|
48
|
+
numerals: string;
|
|
52
49
|
};
|
|
53
50
|
fontSize: {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
51
|
+
default: string;
|
|
52
|
+
xl: string;
|
|
53
|
+
l: string;
|
|
54
|
+
s: string;
|
|
55
|
+
xs: string;
|
|
56
|
+
h1XL: string;
|
|
57
|
+
h1L: string;
|
|
58
|
+
h1M: string;
|
|
59
|
+
h1S: string;
|
|
60
|
+
h2M: string;
|
|
61
|
+
h2S: string;
|
|
62
|
+
h3: string;
|
|
63
|
+
h4: string;
|
|
64
|
+
h5: string;
|
|
65
|
+
h1: string;
|
|
66
|
+
h2: string;
|
|
67
67
|
};
|
|
68
68
|
fontWeight: {
|
|
69
69
|
book: number;
|
|
@@ -79,16 +79,23 @@ export declare const IconContainer: import("styled-components").StyledComponent<
|
|
|
79
79
|
gutter: string;
|
|
80
80
|
};
|
|
81
81
|
lineHeight: {
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
82
|
+
default: string;
|
|
83
|
+
xl: string;
|
|
84
|
+
s: string;
|
|
85
|
+
xs: string;
|
|
86
|
+
xxs: string;
|
|
87
|
+
auto: string;
|
|
88
|
+
h1XL: string;
|
|
89
|
+
h1L: string;
|
|
90
|
+
h1M: string;
|
|
91
|
+
h1S: string;
|
|
92
|
+
h2M: string;
|
|
93
|
+
h2S: string;
|
|
94
|
+
h3: string;
|
|
95
|
+
h4: string;
|
|
96
|
+
h5: string;
|
|
97
|
+
h1: string;
|
|
98
|
+
h2: string;
|
|
92
99
|
};
|
|
93
100
|
media: Record<string | number, (l: TemplateStringsArray, ...p: any[]) => string>;
|
|
94
101
|
}, {
|
|
@@ -16,7 +16,7 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
|
|
|
16
16
|
|
|
17
17
|
const TooltipWrapper = styled['default'].div `
|
|
18
18
|
font-weight: ${p => p.theme.fontWeight.bold};
|
|
19
|
-
font-size: ${p => p.theme.fontSize.
|
|
19
|
+
font-size: ${p => p.theme.fontSize.l};
|
|
20
20
|
margin: 0 ${p => styledUtils.getMultipliedSize(p.theme.base.baseHeight, 1)};
|
|
21
21
|
display: flex;
|
|
22
22
|
flex-direction: column;
|
|
@@ -47,7 +47,7 @@ const TooltipWrapper = styled['default'].div `
|
|
|
47
47
|
}
|
|
48
48
|
${globalNavStyles.MenuLink} {
|
|
49
49
|
font-weight: ${p => p.theme.fontWeight.bold};
|
|
50
|
-
font-size: ${p => p.theme.fontSize.
|
|
50
|
+
font-size: ${p => p.theme.fontSize.default};
|
|
51
51
|
margin: 0rem 1.5rem;
|
|
52
52
|
padding: 0.5rem 0;
|
|
53
53
|
width: 1.5rem;
|
|
@@ -25,10 +25,10 @@ const LinkModifier = ({ menuItem, tabIndex }) => {
|
|
|
25
25
|
const menuItemLink = menuItem.urls[lang] || '';
|
|
26
26
|
if (NextJSLinkComponent && !isMenuItemLinkAbsolute(menuItemLink)) {
|
|
27
27
|
return (React__default['default'].createElement(NextJSLinkComponent, { linkUrl: menuItem.urls[lang] },
|
|
28
|
-
React__default['default'].createElement(globalNavStyles.MenuLink, { href: menuItem.urls[lang], onClick: resetMenuEvents, tabIndex: tabIndex ? -1 : undefined, id: menuItem.id },
|
|
28
|
+
React__default['default'].createElement(globalNavStyles.MenuLink, { href: menuItem.urls[lang], onClick: resetMenuEvents, tabIndex: tabIndex ? -1 : undefined, id: menuItem.id, role: "menuitem" },
|
|
29
29
|
React__default['default'].createElement("span", null, menuItem.titles[lang]))));
|
|
30
30
|
}
|
|
31
|
-
return (React__default['default'].createElement(globalNavStyles.MenuLink, { href: menuItem.urls[lang], onClick: resetMenuEvents, tabIndex: tabIndex ? -1 : undefined, id: menuItem.id },
|
|
31
|
+
return (React__default['default'].createElement(globalNavStyles.MenuLink, { href: menuItem.urls[lang], onClick: resetMenuEvents, tabIndex: tabIndex ? -1 : undefined, id: menuItem.id, role: "menuitem" },
|
|
32
32
|
React__default['default'].createElement("span", null, menuItem.titles[lang])));
|
|
33
33
|
};
|
|
34
34
|
|
package/build/cjs/components/MainNavigation/ChildComponents/MainNavTooltipMenuExportedStyles.d.ts
CHANGED
|
@@ -11,12 +11,7 @@ export declare const TooltipWrapper: import("styled-components").StyledComponent
|
|
|
11
11
|
};
|
|
12
12
|
breakpoints: import("../../../themes/themeComponents/breakpoints").ViewBreakpoints;
|
|
13
13
|
button: {
|
|
14
|
-
|
|
15
|
-
buttonPadding: string;
|
|
16
|
-
smallButtonPadding: string;
|
|
17
|
-
buttonLineHeight: string;
|
|
18
|
-
buttonWidth: string;
|
|
19
|
-
buttonSmallWidth: string;
|
|
14
|
+
border: string;
|
|
20
15
|
};
|
|
21
16
|
color: {
|
|
22
17
|
black: string;
|
|
@@ -47,22 +42,27 @@ export declare const TooltipWrapper: import("styled-components").StyledComponent
|
|
|
47
42
|
gray5: string;
|
|
48
43
|
};
|
|
49
44
|
fontFamily: {
|
|
50
|
-
|
|
45
|
+
default: string;
|
|
46
|
+
heading: string;
|
|
47
|
+
numerals: string;
|
|
51
48
|
};
|
|
52
49
|
fontSize: {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
50
|
+
default: string;
|
|
51
|
+
xl: string;
|
|
52
|
+
l: string;
|
|
53
|
+
s: string;
|
|
54
|
+
xs: string;
|
|
55
|
+
h1XL: string;
|
|
56
|
+
h1L: string;
|
|
57
|
+
h1M: string;
|
|
58
|
+
h1S: string;
|
|
59
|
+
h2M: string;
|
|
60
|
+
h2S: string;
|
|
61
|
+
h3: string;
|
|
62
|
+
h4: string;
|
|
63
|
+
h5: string;
|
|
64
|
+
h1: string;
|
|
65
|
+
h2: string;
|
|
66
66
|
};
|
|
67
67
|
fontWeight: {
|
|
68
68
|
book: number;
|
|
@@ -78,16 +78,23 @@ export declare const TooltipWrapper: import("styled-components").StyledComponent
|
|
|
78
78
|
gutter: string;
|
|
79
79
|
};
|
|
80
80
|
lineHeight: {
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
81
|
+
default: string;
|
|
82
|
+
xl: string;
|
|
83
|
+
s: string;
|
|
84
|
+
xs: string;
|
|
85
|
+
xxs: string;
|
|
86
|
+
auto: string;
|
|
87
|
+
h1XL: string;
|
|
88
|
+
h1L: string;
|
|
89
|
+
h1M: string;
|
|
90
|
+
h1S: string;
|
|
91
|
+
h2M: string;
|
|
92
|
+
h2S: string;
|
|
93
|
+
h3: string;
|
|
94
|
+
h4: string;
|
|
95
|
+
h5: string;
|
|
96
|
+
h1: string;
|
|
97
|
+
h2: string;
|
|
91
98
|
};
|
|
92
99
|
media: Record<string | number, (l: TemplateStringsArray, ...p: any[]) => string>;
|
|
93
100
|
}, {
|
package/build/cjs/components/MainNavigation/ChildComponents/MainNavTooltipMenuExportedStyles.js
CHANGED
|
@@ -54,11 +54,8 @@ const TooltipWrapper = styled['default'].button `
|
|
|
54
54
|
overflow: hidden;
|
|
55
55
|
max-width: ${navigation.IconContainerWidth};
|
|
56
56
|
}
|
|
57
|
-
font-size: ${p => p.theme.fontSize.
|
|
57
|
+
font-size: ${p => p.theme.fontSize.xs};
|
|
58
58
|
font-weight: ${p => p.theme.fontWeight.book};
|
|
59
|
-
@media (min-width: ${navigation.wideMenuBreakpoint}px) {
|
|
60
|
-
font-size: ${p => p.theme.fontSize.xsFontSize};
|
|
61
|
-
}
|
|
62
59
|
}
|
|
63
60
|
}
|
|
64
61
|
`;
|
|
@@ -77,7 +77,7 @@ const MobileMenu = styled['default'].div `
|
|
|
77
77
|
${globalNavStyles.MenuLink}, ${globalNavStyles.MenuLinkWithChildren} {
|
|
78
78
|
line-height: 1.4rem;
|
|
79
79
|
padding: 1.25rem 1rem 1.25rem 1.25rem;
|
|
80
|
-
font-size: ${p => p.theme.fontSize.
|
|
80
|
+
font-size: ${p => p.theme.fontSize.l};
|
|
81
81
|
display: flex;
|
|
82
82
|
flex-grow: 1;
|
|
83
83
|
align-items: center;
|
|
@@ -38,7 +38,7 @@ const RibbonColumn = styled['default'].div `
|
|
|
38
38
|
margin: 0.125rem 0;
|
|
39
39
|
padding: 0.125rem 0;
|
|
40
40
|
color: ${p => p.theme.color.gray55};
|
|
41
|
-
font-size: ${p => p.theme.fontSize.
|
|
41
|
+
font-size: ${p => p.theme.fontSize.xs};
|
|
42
42
|
border-right: 2px solid white;
|
|
43
43
|
&:last-of-type {
|
|
44
44
|
border: none;
|
|
@@ -5,7 +5,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
|
|
|
5
5
|
var ramda = require('ramda');
|
|
6
6
|
var React = require('react');
|
|
7
7
|
var withSizes = require('react-sizes');
|
|
8
|
-
var stickybits = require('stickybits');
|
|
9
8
|
var modifyBodyClass = require('../../hooks/modifyBodyClass.js');
|
|
10
9
|
var useScrollPosition = require('../../hooks/useScrollPosition.js');
|
|
11
10
|
var styled = require('../../themes/styled.js');
|
|
@@ -20,7 +19,6 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
|
|
|
20
19
|
|
|
21
20
|
var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
|
|
22
21
|
var withSizes__default = /*#__PURE__*/_interopDefaultLegacy(withSizes);
|
|
23
|
-
var stickybits__default = /*#__PURE__*/_interopDefaultLegacy(stickybits);
|
|
24
22
|
|
|
25
23
|
// TODO: Use proper props after https://jira.dna.fi/browse/STYLE-232 is done
|
|
26
24
|
const mapSizesToProps = ({ width }, { collapseSize }) => ({
|
|
@@ -175,20 +173,6 @@ items = {}, language = 'fi', zIndex = 1030, languageSelector = false, isMobileMe
|
|
|
175
173
|
hideOnScroll: false,
|
|
176
174
|
});
|
|
177
175
|
const [lang] = React.useState(language);
|
|
178
|
-
// polyfill for browser (e.g. IE11 and older Safari) that don't support CSS position: sticky
|
|
179
|
-
React.useEffect(() => {
|
|
180
|
-
if (!isStickySupported && typeof window !== 'undefined') {
|
|
181
|
-
const stickyElement = navigationEl.current;
|
|
182
|
-
if (stickyElement) {
|
|
183
|
-
const stickyBitsElement = stickybits__default['default'](stickyElement);
|
|
184
|
-
return function cleanUp() {
|
|
185
|
-
if (stickyElement) {
|
|
186
|
-
stickyBitsElement.cleanup();
|
|
187
|
-
}
|
|
188
|
-
};
|
|
189
|
-
}
|
|
190
|
-
}
|
|
191
|
-
}, []);
|
|
192
176
|
const handleNavMenuClick = (newValue, updatedLevel) => {
|
|
193
177
|
let clickedItself = false;
|
|
194
178
|
switch (updatedLevel) {
|
|
@@ -328,7 +312,7 @@ items = {}, language = 'fi', zIndex = 1030, languageSelector = false, isMobileMe
|
|
|
328
312
|
React__default['default'].createElement(GlobalNavigationContainer, { className: className, ref: navigationEl, collapseSize: collapseSize, menuLevel: menuLevel, "data-testid": "main-navigation", navZIndex: zIndex, tooltipMenuActive: tooltipMenuActive },
|
|
329
313
|
React__default['default'].createElement(NavContext['default'].Provider, { value: navigationContext },
|
|
330
314
|
React__default['default'].createElement(GlobalStyle, null),
|
|
331
|
-
!items.mainNavigation && notificationText && (React__default['default'].createElement(Notification['default'], {
|
|
315
|
+
!items.mainNavigation && notificationText && (React__default['default'].createElement(Notification['default'], { type: "info", showIcon: true, closeButton: false }, notificationText)),
|
|
332
316
|
ribbon && ribbonData && (React__default['default'].createElement(Ribbon['default'], { ribbonData: ribbonData, lang: language, navZIndex: zIndex })),
|
|
333
317
|
React__default['default'].createElement(NavigationWrapper, { collapseSize: collapseSize },
|
|
334
318
|
React__default['default'].createElement(HeaderNavigationElements['default'], { navElementProps: props }),
|