Skip to content
Snippets Groups Projects
Commit abad7ac0 authored by katja's avatar katja
Browse files

Merge branch 'NXSTAGE-1493-header' of...

Merge branch 'NXSTAGE-1493-header' of version.helsinki.fi:julkiset-sivut/design-system-lib into NXSTAGE-1493-header
pull latest & merging
parents ee2e60e4 40c69cfd
No related branches found
No related tags found
No related merge requests found
...@@ -2019,6 +2019,7 @@ declare namespace LocalJSX { ...@@ -2019,6 +2019,7 @@ declare namespace LocalJSX {
isMobile?: boolean; isMobile?: boolean;
logoLabel?: string; logoLabel?: string;
logoUrl?: string; logoUrl?: string;
onMobileMenuTopToggle?: (event: CustomEvent<any>) => void;
onUniversityMainMenuToggled?: (event: CustomEvent<any>) => void; onUniversityMainMenuToggled?: (event: CustomEvent<any>) => void;
siteLabel?: string; siteLabel?: string;
siteUrl?: string; siteUrl?: string;
...@@ -2185,6 +2186,7 @@ declare namespace LocalJSX { ...@@ -2185,6 +2186,7 @@ declare namespace LocalJSX {
onHeaderScrollDown?: (event: CustomEvent<any>) => void; onHeaderScrollDown?: (event: CustomEvent<any>) => void;
onHeaderScrollUp?: (event: CustomEvent<any>) => void; onHeaderScrollUp?: (event: CustomEvent<any>) => void;
onMenuMobileToggled?: (event: CustomEvent<any>) => void; onMenuMobileToggled?: (event: CustomEvent<any>) => void;
onMenuMobileTopToggled?: (event: CustomEvent<any>) => void;
siteLabel?: string; siteLabel?: string;
siteUrl?: string; siteUrl?: string;
} }
......
...@@ -275,7 +275,7 @@ ...@@ -275,7 +275,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-items: space-between; justify-items: space-between;
max-width: 350px; max-width: 400px;
overflow: hidden; overflow: hidden;
padding: 0px; padding: 0px;
place-items: stretch; place-items: stretch;
......
...@@ -33,6 +33,7 @@ export class HyMenuMainGroup { ...@@ -33,6 +33,7 @@ export class HyMenuMainGroup {
@State() isMenuOpen: boolean = false; @State() isMenuOpen: boolean = false;
@Event() universityMainMenuToggled: EventEmitter; @Event() universityMainMenuToggled: EventEmitter;
@Event() mobileMenuTopToggle: EventEmitter;
private _dataMainMenu: MainMenu[]; private _dataMainMenu: MainMenu[];
...@@ -43,6 +44,7 @@ export class HyMenuMainGroup { ...@@ -43,6 +44,7 @@ export class HyMenuMainGroup {
@Listen('click') @Listen('click')
handleComponentClick(event) { handleComponentClick(event) {
this.mobileMenuTopToggle.emit();
this.isMenuOpen = !this.isMenuOpen; this.isMenuOpen = !this.isMenuOpen;
if (this.isMenuOpen) { if (this.isMenuOpen) {
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
| Event | Description | Type | | Event | Description | Type |
| --------------------------- | ----------- | ------------------ | | --------------------------- | ----------- | ------------------ |
| `mobileMenuTopToggle` | | `CustomEvent<any>` |
| `universityMainMenuToggled` | | `CustomEvent<any>` | | `universityMainMenuToggled` | | `CustomEvent<any>` |
## Dependencies ## Dependencies
......
...@@ -25,11 +25,12 @@ ...@@ -25,11 +25,12 @@
## Events ## Events
| Event | Description | Type | | Event | Description | Type |
| ------------------- | ----------- | ------------------ | | ---------------------- | ----------- | ------------------ |
| `headerScrollDown` | | `CustomEvent<any>` | | `headerScrollDown` | | `CustomEvent<any>` |
| `headerScrollUp` | | `CustomEvent<any>` | | `headerScrollUp` | | `CustomEvent<any>` |
| `menuMobileToggled` | | `CustomEvent<any>` | | `menuMobileToggled` | | `CustomEvent<any>` |
| `menuMobileTopToggled` | | `CustomEvent<any>` |
## Dependencies ## Dependencies
......
...@@ -52,6 +52,7 @@ export class SiteHeader { ...@@ -52,6 +52,7 @@ export class SiteHeader {
@Event() headerScrollUp: EventEmitter; @Event() headerScrollUp: EventEmitter;
@Event() headerScrollDown: EventEmitter; @Event() headerScrollDown: EventEmitter;
@Event() menuMobileToggled: EventEmitter; @Event() menuMobileToggled: EventEmitter;
@Event() menuMobileTopToggled: EventEmitter;
private ro: ResizeObserver; private ro: ResizeObserver;
private donateLink: DonateLink[]; private donateLink: DonateLink[];
...@@ -71,6 +72,12 @@ export class SiteHeader { ...@@ -71,6 +72,12 @@ export class SiteHeader {
this.menuMobileToggled.emit(); this.menuMobileToggled.emit();
} }
// Listener for toggling mobile menu top panel on or off.
@Listen('mobileMenuTopToggle') mobileMenuTopToggle() {
this.isMenuOpen = !this.isMenuOpen;
this.menuMobileTopToggled.emit();
}
@Listen('scroll', {target: 'window'}) @Listen('scroll', {target: 'window'})
handleScroll() { handleScroll() {
if (this.el.getAttribute('menu-type') === 'desktop') { if (this.el.getAttribute('menu-type') === 'desktop') {
...@@ -221,7 +228,6 @@ export class SiteHeader { ...@@ -221,7 +228,6 @@ export class SiteHeader {
const logoColor = ColorVariant.black; const logoColor = ColorVariant.black;
const logoColorGroup = ColorVariant.white; const logoColorGroup = ColorVariant.white;
let classAttributes = ['hy-site-header', 'hy-site-header--' + this.menuType]; let classAttributes = ['hy-site-header', 'hy-site-header--' + this.menuType];
switch (this.menuType) { switch (this.menuType) {
case MenuType.desktop: case MenuType.desktop:
// Larger than 1200px screens // Larger than 1200px screens
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment