From e9a2554a3d658b1c4006882d9e6ebf1dcde5cda1 Mon Sep 17 00:00:00 2001
From: Tuukka Turu <tuukka.turu@druid.fi>
Date: Fri, 5 Mar 2021 12:54:43 +0200
Subject: [PATCH] Check for mobile donate link

---
 src/components.d.ts                             |  2 ++
 .../hy-menu-main-group/hy-menu-main-group.tsx   |  4 +---
 src/components/navigation/menu/menu.tsx         | 17 ++++++++++-------
 src/components/navigation/menu/readme.md        |  1 +
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/components.d.ts b/src/components.d.ts
index 40e55d71..1ae996ab 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -542,6 +542,7 @@ export namespace Components {
     dataMenuDonate: string;
     dataMenuLanguage: string;
     isDemo: boolean;
+    isGroup: boolean;
     labelFrontPage: string;
     logoLabel: string;
     logoUrl: string;
@@ -1917,6 +1918,7 @@ declare namespace LocalJSX {
     dataMenuDonate?: string;
     dataMenuLanguage?: string;
     isDemo?: boolean;
+    isGroup?: boolean;
     labelFrontPage?: string;
     logoLabel?: string;
     logoUrl?: string;
diff --git a/src/components/navigation/hy-menu-main-group/hy-menu-main-group.tsx b/src/components/navigation/hy-menu-main-group/hy-menu-main-group.tsx
index fe3a5917..31914440 100644
--- a/src/components/navigation/hy-menu-main-group/hy-menu-main-group.tsx
+++ b/src/components/navigation/hy-menu-main-group/hy-menu-main-group.tsx
@@ -78,9 +78,7 @@ export class HyMenuMainGroup {
   adjustMainMenuPosition(target) {
     let hyTopHeader = this.el.closest('.hy-site-header__content-top') as HTMLElement;
 
-    if (hyTopHeader && hyTopHeader.hasAttribute('is-mobile')) {
-      console.log('do mobile stuff');
-    } else {
+    if (hyTopHeader && !hyTopHeader.hasAttribute('is-mobile')) {
       let mainMenuToggle = target.shadowRoot.querySelector('.menu--main-group__toggle') as HTMLElement;
       let mainMenuDropdown = target.shadowRoot.querySelector('.menu--main-group__dropdown') as HTMLElement;
       let mainMenuList = target.shadowRoot.querySelector('.list') as HTMLElement;
diff --git a/src/components/navigation/menu/menu.tsx b/src/components/navigation/menu/menu.tsx
index 2293aaf4..7353db8d 100644
--- a/src/components/navigation/menu/menu.tsx
+++ b/src/components/navigation/menu/menu.tsx
@@ -12,6 +12,7 @@ export class Menu {
   @Event() menuContainerToggled: EventEmitter;
   @Prop() dataMenuDonate: string;
   @Prop() dataMenuLanguage: string;
+  @Prop() isGroup: boolean = false;
   @Prop() isDemo: boolean = false;
   @Prop() labelFrontPage: string;
   @Prop() logoUrl: string;
@@ -193,13 +194,15 @@ export class Menu {
                 <slot />
               </div>
             </div>
-            <div class={'hy-link__donate'}>
-              {this.donateLink
-                ? this.donateLink.map((i) => {
-                    return <a href={i.url}>{i.label}</a>;
-                  })
-                : ''}
-            </div>
+            {!this.isGroup && (
+              <div class={'hy-link__donate'}>
+                {this.donateLink
+                  ? this.donateLink.map((i) => {
+                      return <a href={i.url}>{i.label}</a>;
+                    })
+                  : ''}
+              </div>
+            )}
           </nav>
         );
     }
diff --git a/src/components/navigation/menu/readme.md b/src/components/navigation/menu/readme.md
index 01d7e789..6dce64e5 100644
--- a/src/components/navigation/menu/readme.md
+++ b/src/components/navigation/menu/readme.md
@@ -9,6 +9,7 @@
 | `dataMenuDonate`              | `data-menu-donate`               |             | `string`                                                                                           | `undefined`        |
 | `dataMenuLanguage`            | `data-menu-language`             |             | `string`                                                                                           | `undefined`        |
 | `isDemo`                      | `is-demo`                        |             | `boolean`                                                                                          | `false`            |
+| `isGroup`                     | `is-group`                       |             | `boolean`                                                                                          | `false`            |
 | `labelFrontPage`              | `label-front-page`               |             | `string`                                                                                           | `undefined`        |
 | `logoLabel`                   | `logo-label`                     |             | `string`                                                                                           | `undefined`        |
 | `logoUrl`                     | `logo-url`                       |             | `string`                                                                                           | `undefined`        |
-- 
GitLab