From ff8ebf24f71f950a313ae5efe3f7092fb19dac81 Mon Sep 17 00:00:00 2001
From: Richard Steinmetz <richard@steinmetz.cloud>
Date: Tue, 29 Oct 2024 09:09:50 +0100
Subject: [PATCH] fixup! fix(NcAppNavigationItem): use $scopedSlots instead of
 $slots

---
 .../NcAppNavigationItem.vue                   | 28 ++++++++-----------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/components/NcAppNavigationItem/NcAppNavigationItem.vue b/src/components/NcAppNavigationItem/NcAppNavigationItem.vue
index d2dd9fce92..731fa96fe3 100644
--- a/src/components/NcAppNavigationItem/NcAppNavigationItem.vue
+++ b/src/components/NcAppNavigationItem/NcAppNavigationItem.vue
@@ -256,7 +256,7 @@ Just set the `pinned` prop.
 		:class="{
 			'app-navigation-entry--opened': opened,
 			'app-navigation-entry--pinned': pinned,
-			'app-navigation-entry--collapsible': collapsible,
+			'app-navigation-entry--collapsible': isCollapsible(),
 		}"
 		class="app-navigation-entry-wrapper">
 		<component :is="isRouterLink ? 'router-link' : 'NcVNodes'"
@@ -275,7 +275,7 @@ Just set the `pinned` prop.
 					class="app-navigation-entry-link"
 					:aria-current="active || (isActive && to) ? 'page' : undefined"
 					:aria-description="ariaDescription"
-					:aria-expanded="hasChildren ? opened.toString() : undefined"
+					:aria-expanded="$scopedSlots.default ? opened.toString() : undefined"
 					:href="href || routerLinkHref || '#'"
 					:target="isExternal(href) ? '_blank' : undefined"
 					:title="title || name"
@@ -356,14 +356,14 @@ Just set the `pinned` prop.
 						<slot name="actions" />
 					</NcActions>
 				</div>
-				<NcAppNavigationIconCollapsible v-if="collapsible" :open="opened" @click.prevent.stop="toggleCollapse" />
+				<NcAppNavigationIconCollapsible v-if="isCollapsible()" :open="opened" @click.prevent.stop="toggleCollapse" />
 
 				<!-- @slot Slot for anything (virtual) that should be mounted in the component, like a related modal -->
 				<slot name="extra" />
 			</div>
 		</component>
 		<!-- Children elements -->
-		<ul v-if="canHaveChildren && hasChildren" class="app-navigation-entry__children">
+		<ul v-if="canHaveChildren && $scopedSlots.default" class="app-navigation-entry__children">
 			<!-- @slot Slot for children -->
 			<slot />
 		</ul>
@@ -614,13 +614,11 @@ export default {
 			editingValue: '',
 			opened: this.open, // Collapsible state
 			editingActive: false,
-			hasChildren: false,
 			/**
 			 * Tracks the open state of the actions menu
 			 */
 			menuOpenLocalValue: false,
 			focused: false,
-			collapsible: false,
 			actionsBoundariesElement: undefined,
 		}
 	},
@@ -666,14 +664,6 @@ export default {
 		this.actionsBoundariesElement = document.querySelector('#content-vue') || undefined
 	},
 
-	created() {
-		this.updateSlotInfo()
-	},
-
-	beforeUpdate() {
-		this.updateSlotInfo()
-	},
-
 	methods: {
 		// sync opened menu state with prop
 		onMenuToggle(state) {
@@ -730,9 +720,13 @@ export default {
 			this.$emit('undo')
 		},
 
-		updateSlotInfo() {
-			this.hasChildren = !!this.$scopedSlots.default
-			this.collapsible = this.allowCollapse && !!this.$scopedSlots.default
+		/**
+		 * Does this item have children and is collapsing allowed via the prop?
+		 *
+		 * @return {boolean} True, if the item can be collapsed
+		 */
+		isCollapsible() {
+			return this.allowCollapse && !!this.$scopedSlots.default
 		},
 
 		/**