Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from Dec 5, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c49c3e
fix(UnifiedSearch): Move headings out of list elements
susnux Dec 3, 2023
acf619b
fix: Adjust code to be Vue 2.7 compatible as `key` on `<template>` is…
susnux Dec 3, 2023
fd580e5
chore: Compile assets
susnux Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 7 additions & 9 deletions core/src/views/UnifiedSearch.vue
View file
Open in desktop
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions dist/core-unified-search.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-unified-search.js.map
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion tsconfig.json
View file
Open in desktop
@@ -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/",
Expand All @@ -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
Expand Down