Merge pull request #42032 from nextcloud/backport/unified-search-headings

[stable28] fix(UnifiedSearch): Move headings out of list element (invalid HTML)

Author: susnux

core/src/views/UnifiedSearch.vue

@@ -36,10 +36,10 @@
 		<!-- Search form & filters wrapper -->
 		<div class="unified-search__input-wrapper">
 			<div class="unified-search__input-row">
-				<NcTextField :value.sync="query"
+				<NcTextField ref="input"
+					:value.sync="query"
 					trailing-button-icon="close"
 					:label="ariaLabel"
-					ref="input"
 					:trailing-button-label="t('core','Reset search')"
 					:show-trailing-button="query !== ''"
 					aria-describedby="unified-search-desc"
@@ -90,16 +90,14 @@
 		</template>
 
 		<!-- Grouped search results -->
-		<template v-else>
-			<ul v-for="({list, type}, typesIndex) in orderedResults"
-				:key="type"
+		<template v-for="({list, type}, typesIndex) in orderedResults" v-else>
+			<h2 :key="type" class="unified-search__results-header">
+				{{ typesMap[type] }}
+			</h2>
+			<ul :key="type"
 				class="unified-search__results"
 				:class="`unified-search__results-${type}`"
 				:aria-label="typesMap[type]">
-				<h2 class="unified-search__results-header">
-					{{ typesMap[type] }}
-				</h2>
-
 				<!-- Search results -->
 				<li v-for="(result, index) in limitIfAny(list, type)" :key="result.resourceUrl">
 					<SearchResult v-bind="result"

dist/core-unified-search.js

@@ -1,6 +1,6 @@
 {
 	"extends": "@vue/tsconfig/tsconfig.json",
-	"include": ["./apps/**/*.ts", "./apps/**/*.vue", "./core/**/*.ts", "./*.d.ts"],
+	"include": ["./apps/**/*.ts", "./apps/**/*.vue", "./core/**/*.ts", "./core/**/*.vue", "./*.d.ts"],
 	"compilerOptions": {
 		"types": ["jest", "node", "vue", "vue-router"],
 		"outDir": "./dist/",
@@ -18,6 +18,9 @@
 		"resolveJsonModule": true,
 		"strict": true,
 	},
+	"vueCompilerOptions": {
+		"target": 2.7
+	},
 	"ts-node": {
 		// these options are overrides used only by ts-node
 		// same as our --compilerOptions flag and our TS_NODE_COMPILER_OPTIONS environment variable