Merge pull request #41609 from nextcloud/enh/in-app-search

feat: In app search

apps/files/src/views/FilesList.vue

@@ -464,15 +464,15 @@ export default defineComponent({
 
 			logger.debug('View changed', { newView, oldView })
 			this.selectionStore.reset()
-			this.resetSearch()
+			this.triggerResetSearch()
 			this.fetchContent()
 		},
 
 		dir(newDir, oldDir) {
 			logger.debug('Directory changed', { newDir, oldDir })
 			// TODO: preserve selection on browsing?
 			this.selectionStore.reset()
-			this.resetSearch()
+			this.triggerResetSearch()
 			this.fetchContent()
 
 			// Scroll to top, force virtual scroller to re-render
@@ -493,8 +493,8 @@ export default defineComponent({
 
 		subscribe('files:node:deleted', this.onNodeDeleted)
 		subscribe('files:node:updated', this.onUpdatedNode)
-		subscribe('nextcloud:unified-search.search', this.onSearch)
-		subscribe('nextcloud:unified-search.reset', this.resetSearch)
+		subscribe('nextcloud:unified-search:search', this.onSearch)
+		subscribe('nextcloud:unified-search:reset', this.onResetSearch)
 
 		// reload on settings change
 		this.unsubscribeStoreCallback = this.userConfigStore.$subscribe(() => this.fetchContent(), { deep: true })
@@ -503,8 +503,8 @@ export default defineComponent({
 	unmounted() {
 		unsubscribe('files:node:deleted', this.onNodeDeleted)
 		unsubscribe('files:node:updated', this.onUpdatedNode)
-		unsubscribe('nextcloud:unified-search.search', this.onSearch)
-		unsubscribe('nextcloud:unified-search.reset', this.resetSearch)
+		unsubscribe('nextcloud:unified-search:search', this.onSearch)
+		unsubscribe('nextcloud:unified-search:reset', this.onResetSearch)
 		this.unsubscribeStoreCallback()
 	},
 
@@ -676,15 +676,23 @@ export default defineComponent({
 		},
 
 		/**
-		 * Reset the search query
+		 * Handle reset search query event
 		 */
-		resetSearch() {
+		onResetSearch() {
 			// Reset debounced calls to not set the query again
 			this.onSearch.clear()
 			// Reset filter query
 			this.filterText = ''
 		},
 
+		/**
+		 * Trigger a reset of the local search (part of unified search)
+		 * This is usful to reset the search on directory / view change
+		 */
+		triggerResetSearch() {
+			emit('nextcloud:unified-search:reset')
+		},
+
 		openSharingSidebar() {
 			if (!this.currentFolder) {
 				logger.debug('No current folder found for opening sharing sidebar')

core/css/header.scss

@@ -32,6 +32,9 @@
 	}
 
 	.header-right {
+		// Add some spacing so the last entry looks ok
+		margin-inline-end: calc(3 * var(--default-grid-baseline));
+
 		a:not(.button):focus-visible::after, div[role=button]:focus-visible::after {
 			bottom: 4px;
 		}