Merge pull request #41708 from nextcloud/backport/41687/stable28

[stable28] fix(core): Subscribe to navigation changes on mounted for Unified search
nextcloud · Nov 24, 2023 · 36109fd · 36109fd
2 parents 0d478a0 + 076abb6
commit 36109fd
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/core/src/views/UnifiedSearch.vue b/core/src/views/UnifiedSearch.vue
@@ -334,7 +334,6 @@ export default {
 	},
 
 	async created() {
-		subscribe('files:navigation:changed', this.onNavigationChange)
 		this.types = await getTypes()
 		this.logger.debug('Unified Search initialized with the following providers', this.types)
 	},
@@ -344,6 +343,9 @@ export default {
 	},
 
 	mounted() {
+		// subscribe in mounted, as onNavigationChange relys on $el
+		subscribe('files:navigation:changed', this.onNavigationChange)
+
 		if (OCP.Accessibility.disableKeyboardShortcuts()) {
 			return
 		}
@@ -383,7 +385,7 @@ export default {
 		},
 
 		onNavigationChange() {
-			this.$el.querySelector('form[role="search"]').reset()
+			this.$el?.querySelector?.('form[role="search"]')?.reset?.()
 		},
 
 		/**

diff --git a/dist/core-common.js b/dist/core-common.js
diff --git a/dist/core-common.js.map b/dist/core-common.js.map
diff --git a/dist/core-unified-search.js b/dist/core-unified-search.js
diff --git a/dist/core-unified-search.js.map b/dist/core-unified-search.js.map