From c726f3fa2c75bede0a141568dfcc60ffb9f47f2d Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Wed, 9 Mar 2022 15:47:17 -0300 Subject: [PATCH] Displays collapsed filters in a different manner. #680. --- .../filter-types/tainacan-filter-item.vue | 23 +++++++++++++------ .../components/search/filters-items-list.vue | 10 ++++---- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/views/admin/components/filter-types/tainacan-filter-item.vue b/src/views/admin/components/filter-types/tainacan-filter-item.vue index 1bd1b2a35..c3ef5c89b 100644 --- a/src/views/admin/components/filter-types/tainacan-filter-item.vue +++ b/src/views/admin/components/filter-types/tainacan-filter-item.vue @@ -5,12 +5,12 @@ @@ -89,14 +89,15 @@ filter: Object, query: Object, isRepositoryLevel: Boolean, - open: true, + expandAll: true, isLoadingItems: true, filtersAsModal: Boolean }, data() { return { isUsingElasticSearch: tainacan_plugin.wp_elasticpress == "1" ? true : false, - displayFilter: false + displayFilter: false, + singleCollapseOpen: this.expandAll } }, computed: { @@ -105,6 +106,11 @@ } }, watch: { + expandAll() { + this.singleCollapseOpen = this.expandAll; + if (this.expandAll) + this.displayFilter = true; + }, beginWithFilterCollapsed: { handler() { this.displayFilter = !this.beginWithFilterCollapsed; @@ -119,7 +125,7 @@ onFilterUpdateParentCollapse(open) { const componentsThatShouldCollapseIfEmpty = ['tainacan-filter-taxonomy-checkbox', 'tainacan-filter-selectbox', 'tainacan-filter-checkbox']; if (componentsThatShouldCollapseIfEmpty.includes(this.filter.filter_type_object.component)) - this.open = open; + this.singleCollapseOpen = open; } } } @@ -152,6 +158,9 @@ line-height: 1.4em; } } + .disabled-filter { + opacity: 0.75; + } .collapse-content { margin-top: 12px; } diff --git a/src/views/admin/components/search/filters-items-list.vue b/src/views/admin/components/search/filters-items-list.vue index c83c5c6e4..3a7a640df 100644 --- a/src/views/admin/components/search/filters-items-list.vue +++ b/src/views/admin/components/search/filters-items-list.vue @@ -85,7 +85,7 @@ v-for="(filter, filterIndex) in taxonomyFilter" :key="filterIndex" :filter="filter" - :open="!collapseAll" + :expand-all="!collapseAll" :is-repository-level="key == 'repository-filters'" :filters-as-modal="filtersAsModal"/> @@ -133,7 +133,7 @@ v-for="(filter, filterIndex) in taxonomyFilter" :key="filterIndex" :filter="filter" - :open="!collapseAll" + :expand-all="!collapseAll" :is-repository-level="key == 'repository-filters'" :filters-as-modal="filtersAsModal"/> @@ -185,7 +185,7 @@ v-for="(filter, filterIndex) in repositoryCollectionFilter" :key="filterIndex" :filter="filter" - :open="!collapseAll" + :expand-all="!collapseAll" :is-repository-level="key == 'repository-filters'" :filters-as-modal="filtersAsModal"/> @@ -233,7 +233,7 @@ v-for="(filter, filterIndex) in repositoryCollectionFilter" :key="filterIndex" :filter="filter" - :open="!collapseAll" + :expand-all="!collapseAll" :is-repository-level="key == 'repository-filters'" :filters-as-modal="filtersAsModal"/> @@ -256,7 +256,7 @@ v-for="(filter, index) in filters" :key="index" :filter="filter" - :open="!collapseAll" + :expand-all="!collapseAll" :is-repository-level="isRepositoryLevel" :filters-as-modal="filtersAsModal"/>