From 7df4432601df230fe3bcfce5df0e0befd384fd91 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Fri, 13 Mar 2020 00:09:33 +0100
Subject: [PATCH] Fix: named slot scopes

---
 webapp/components/ContentMenu/ContentMenu.vue | 19 ++++++------
 .../DropdownFilter/DropdownFilter.vue         | 29 +++++++++---------
 .../components/LocaleSwitch/LocaleSwitch.vue  | 30 +++++++++----------
 3 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/webapp/components/ContentMenu/ContentMenu.vue b/webapp/components/ContentMenu/ContentMenu.vue
index 1b9f24317..ba9c37c34 100644
--- a/webapp/components/ContentMenu/ContentMenu.vue
+++ b/webapp/components/ContentMenu/ContentMenu.vue
@@ -15,15 +15,16 @@
     <template #popover="{ toggleMenu }">
       <div class="content-menu-popover">
         <ds-menu :routes="routes">
-          <ds-menu-item
-            #menuitem="item"
-            :route="item.route"
-            :parents="item.parents"
-            @click.stop.prevent="openItem(item.route, toggleMenu)"
-          >
-            <base-icon :name="item.route.icon" />
-            {{ item.route.label }}
-          </ds-menu-item>
+          <template #menuitem="item">
+            <ds-menu-item
+              :route="item.route"
+              :parents="item.parents"
+              @click.stop.prevent="openItem(item.route, toggleMenu)"
+            >
+              <base-icon :name="item.route.icon" />
+              {{ item.route.label }}
+            </ds-menu-item>
+          </template>
         </ds-menu>
       </div>
     </template>
diff --git a/webapp/components/DropdownFilter/DropdownFilter.vue b/webapp/components/DropdownFilter/DropdownFilter.vue
index 4abf6ab41..27d29e5e1 100644
--- a/webapp/components/DropdownFilter/DropdownFilter.vue
+++ b/webapp/components/DropdownFilter/DropdownFilter.vue
@@ -13,21 +13,20 @@
         <base-icon class="dropdown-arrow" name="angle-down" />
       </a>
     </template>
-    <ds-menu
-      #popover="{ toggleMenu }"
-      class="dropdown-menu-popover"
-      :routes="filterOptions"
-    >
-      <ds-menu-item
-        #menuitem="item"
-        class="dropdown-menu-item"
-        :route="item.route"
-        :parents="item.parents"
-        @click.stop.prevent="filter(item.route, toggleMenu)"
-      >
-        {{ item.route.label }}
-      </ds-menu-item>
-    </ds-menu>
+    <template #popover="{ toggleMenu }">
+      <ds-menu class="dropdown-menu-popover" :routes="filterOptions">
+        <template #menuitem="item">
+          <ds-menu-item
+            class="dropdown-menu-item"
+            :route="item.route"
+            :parents="item.parents"
+            @click.stop.prevent="filter(item.route, toggleMenu)"
+          >
+            {{ item.route.label }}
+          </ds-menu-item>
+        </template>
+      </ds-menu>
+    </template>
   </dropdown>
 </template>
 <script>
diff --git a/webapp/components/LocaleSwitch/LocaleSwitch.vue b/webapp/components/LocaleSwitch/LocaleSwitch.vue
index c38a600b1..fc87b7aa5 100644
--- a/webapp/components/LocaleSwitch/LocaleSwitch.vue
+++ b/webapp/components/LocaleSwitch/LocaleSwitch.vue
@@ -8,22 +8,20 @@
           <base-icon class="dropdown-arrow" name="angle-down" />
         </a>
       </template>
-      <ds-menu
-        #popover="{ toggleMenu }"
-        class="locale-menu-popover"
-        :matcher="matcher"
-        :routes="routes"
-      >
-        <ds-menu-item
-          #menuitem="item"
-          class="locale-menu-item"
-          :route="item.route"
-          :parents="item.parents"
-          @click.stop.prevent="changeLanguage(item.route.path, toggleMenu)"
-        >
-          {{ item.route.name }}
-        </ds-menu-item>
-      </ds-menu>
+      <template #popover="{ toggleMenu }">
+        <ds-menu class="locale-menu-popover" :matcher="matcher" :routes="routes">
+          <template #menuitem="item">
+            <ds-menu-item
+              class="locale-menu-item"
+              :route="item.route"
+              :parents="item.parents"
+              @click.stop.prevent="changeLanguage(item.route.path, toggleMenu)"
+            >
+              {{ item.route.name }}
+            </ds-menu-item>
+          </template>
+        </ds-menu>
+      </template>
     </dropdown>
   </client-only>
 </template>