Merge pull request #47333 from nextcloud/backport/47319/stable30

[stable30] fix(UnifiedSearch): Focus search input on open
nextcloud · Aug 21, 2024 · 629bd67 · 629bd67
2 parents fc9a454 + ad27c5f
commit 629bd67
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/core/src/components/UnifiedSearch/UnifiedSearchModal.vue b/core/src/components/UnifiedSearch/UnifiedSearchModal.vue
@@ -304,8 +304,11 @@ export default defineComponent({
 	watch: {
 		open() {
 			// Load results when opened with already filled query
-			if (this.open && this.searchQuery) {
-				this.find(this.searchQuery)
+			if (this.open) {
+				this.focusInput()
+				if (this.searchQuery) {
+					this.find(this.searchQuery)
+				}
 			}
 		},
 
@@ -351,7 +354,11 @@ export default defineComponent({
 			this.$emit('update:query', this.searchQuery)
 			this.$emit('update:open', false)
 		},
-
+		focusInput() {
+			this.$nextTick(() => {
+				this.$refs.searchInput?.focus()
+			})
+		},
 		find(query: string) {
 			if (query.length === 0) {
 				this.results = []

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