Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/components/Facet.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ function onToggle (event: Event) {
}
}


</script>

<template>
Expand All @@ -37,7 +38,7 @@ function onToggle (event: Event) {
<details :open="expanded" :aria-expanded="expanded" @toggle="onToggle">
<summary>{{ facetName }}</summary>
<template v-if="expanded">
<TermSelection v-for="term in rootTerms" :key="term.id" :facet="props.facet" :term="term"/>
<TermSelection v-for="term in rootTerms" :key="term.id" :facet="props.facet" :term="term" />
</template>
</details>
</fieldset>
Expand Down
34 changes: 33 additions & 1 deletion src/components/Facets.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<script setup lang="ts">
import { storeToRefs } from 'pinia'
import { computed } from 'vue'
import { useFacetStore } from '../stores/facets'
import { useSessionStore } from '../stores/session'
import { useSearchStore } from '../stores/search'

import filter from '../assets/filter.svg'

Expand All @@ -13,6 +15,19 @@ import TermDeselection from './TermDeselection.vue'
const { facets } = storeToRefs(useFacetStore())
const { isAdmin } = storeToRefs(useSessionStore())

const search = useSearchStore()
const liveMessage = computed(() => {
const parts: string[] = []
for (const facetName of search.activeFacetNames) {
const termNames = search.selectedTerms(facetName).value
if (termNames.length > 0) {
parts.push(`${facetName}: ${termNames.join(', ')}`)
}
}
return parts.length > 0
? `Selected filters – ${parts.join('; ')}.`
: 'No filters selected.'
})
</script>

<template>
Expand All @@ -33,6 +48,10 @@ const { isAdmin } = storeToRefs(useSessionStore())
:facet="facet"
/>
</form>

<!-- Accessible live region -->
<span class="sr-only" aria-live="polite" aria-atomic="true">{{ liveMessage }}</span>

</div>
</template>

Expand Down Expand Up @@ -147,5 +166,18 @@ div.galc-facets {
}
}
}
}

.sr-only {
position: absolute;
width: 1px;
height: 1px;
padding: 0;
margin: -1px;
overflow: hidden;
clip: rect(0, 0, 0, 0);
white-space: nowrap;
border-width: 0;
}
}

</style>
1 change: 0 additions & 1 deletion src/components/TermSelection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const props = defineProps({
// Stores

const { selectedTerms } = useSearchStore()

const selected = selectedTerms(props.facet.name)

</script>
Expand Down
5 changes: 4 additions & 1 deletion src/stores/search.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export const useSearchStore = defineStore('search', () => {
return doSearch(state.value)
}

const exported = { init, keywords, suppressed, page, selectedTerms, refreshSearch, resetSearch, canResetSearch }
//const exported = { init, keywords, suppressed, page, selectedTerms, refreshSearch, resetSearch, canResetSearch }

// --------------------------------------------------
// Internal functions and properties
Expand Down Expand Up @@ -228,6 +228,9 @@ export const useSearchStore = defineStore('search', () => {
// --------------------------------------------------
// Store definition

const exported = { init, keywords, suppressed, page, selectedTerms, refreshSearch, resetSearch, canResetSearch, activeFacetNames }


return exported
})

Expand Down
Loading