Fix closing filter popups
All checks were successful
continuous-integration/drone/pr Build is passing

This commit is contained in:
kolaente 2021-01-17 11:27:50 +01:00
parent e77d65f568
commit 238b3eeffa
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
6 changed files with 99 additions and 40 deletions

View File

@ -0,0 +1,65 @@
<template>
<transition name="fade">
<filters
@change="change"
v-if="visibleInternal"
v-model="params"
ref="filters"
/>
</transition>
</template>
<script>
import {closeWhenClickedOutside} from '@/helpers/closeWhenClickedOutside'
import Filters from '../../../components/list/partials/filters'
export default {
name: 'filter-popup',
data() {
return {
params: null,
visibleInternal: false,
}
},
components: {
Filters,
},
mounted() {
this.params = this.value
document.addEventListener('click', this.hidePopup)
},
beforeDestroy() {
document.removeEventListener('click', this.hidePopup)
},
watch: {
value(newVal) {
this.$set(this, 'params', newVal)
},
visible() {
this.visibleInternal = !this.visibleInternal
},
},
props: {
value: {
required: true,
},
visible: {
type: Boolean,
default: false,
},
},
methods: {
change() {
this.$emit('change', this.params)
this.$emit('input', this.params)
},
hidePopup(e) {
if (this.visibleInternal) {
closeWhenClickedOutside(e, this.$refs.filters.$el, () => {
this.visibleInternal = false
})
}
},
},
}
</script>

View File

@ -2,20 +2,18 @@
<div class="gantt-chart box"> <div class="gantt-chart box">
<div class="filter-container"> <div class="filter-container">
<div class="items"> <div class="items">
<button @click="showTaskFilter = !showTaskFilter" class="button"> <button @click.prevent.stop="showTaskFilter = !showTaskFilter" class="button">
<span class="icon is-small"> <span class="icon is-small">
<icon icon="filter"/> <icon icon="filter"/>
</span> </span>
Filters Filters
</button> </button>
</div> </div>
<transition name="fade"> <filter-popup
<filters
@change="loadTasks" @change="loadTasks"
v-if="showTaskFilter" :visible="showTaskFilter"
v-model="params" v-model="params"
/> />
</transition>
</div> </div>
<div class="dates"> <div class="dates">
<template v-for="(y, yk) in days"> <template v-for="(y, yk) in days">
@ -166,12 +164,12 @@ import PriorityLabel from './partials/priorityLabel'
import TaskCollectionService from '../../services/taskCollection' import TaskCollectionService from '../../services/taskCollection'
import {mapState} from 'vuex' import {mapState} from 'vuex'
import Rights from '../../models/rights.json' import Rights from '../../models/rights.json'
import Filters from '@/components/list/partials/filters' import FilterPopup from '@/components/list/partials/filter-popup'
export default { export default {
name: 'GanttChart', name: 'GanttChart',
components: { components: {
Filters, FilterPopup,
PriorityLabel, PriorityLabel,
EditTask, EditTask,
VueDragResize, VueDragResize,

View File

@ -11,7 +11,7 @@ export const closeWhenClickedOutside = (event, rootElement, closeCallback) => {
// closing callback when a click happens outside of the rootElement. // closing callback when a click happens outside of the rootElement.
let parent = event.target.parentElement let parent = event.target.parentElement
while (parent !== rootElement) { while (parent !== rootElement) {
if (parent.parentElement === null) { if (parent === null || parent.parentElement === null) {
parent = null parent = null
break break
} }

View File

@ -2,20 +2,18 @@
<div class="kanban-view"> <div class="kanban-view">
<div class="filter-container" v-if="list.isSavedFilter && !list.isSavedFilter()"> <div class="filter-container" v-if="list.isSavedFilter && !list.isSavedFilter()">
<div class="items"> <div class="items">
<button @click="showFilters = !showFilters" class="button"> <button @click.prevent.stop="showFilters = !showFilters" class="button">
<span class="icon is-small"> <span class="icon is-small">
<icon icon="filter"/> <icon icon="filter"/>
</span> </span>
Filters Filters
</button> </button>
</div> </div>
<transition name="fade"> <filter-popup
<filters
@change="() => {filtersChanged = true; loadBuckets()}" @change="() => {filtersChanged = true; loadBuckets()}"
v-if="showFilters" :visible="showFilters"
v-model="params" v-model="params"
/> />
</transition>
</div> </div>
<div :class="{ 'is-loading': loading && !oneTaskUpdating}" class="kanban loader-container"> <div :class="{ 'is-loading': loading && !oneTaskUpdating}" class="kanban loader-container">
<div :key="`bucket${bucket.id}`" class="bucket" v-for="bucket in buckets"> <div :key="`bucket${bucket.id}`" class="bucket" v-for="bucket in buckets">
@ -265,7 +263,6 @@ import {Container, Draggable} from 'vue-smooth-dnd'
import PriorityLabel from '../../../components/tasks/partials/priorityLabel' import PriorityLabel from '../../../components/tasks/partials/priorityLabel'
import User from '../../../components/misc/user' import User from '../../../components/misc/user'
import Labels from '../../../components/tasks/partials/labels' import Labels from '../../../components/tasks/partials/labels'
import Filters from '../../../components/list/partials/filters'
import {filterObject} from '@/helpers/filterObject' import {filterObject} from '@/helpers/filterObject'
import {applyDrag} from '@/helpers/applyDrag' import {applyDrag} from '@/helpers/applyDrag'
@ -273,16 +270,17 @@ import {mapState} from 'vuex'
import {saveListView} from '@/helpers/saveListView' import {saveListView} from '@/helpers/saveListView'
import Rights from '../../../models/rights.json' import Rights from '../../../models/rights.json'
import { LOADING, LOADING_MODULE } from '../../../store/mutation-types' import { LOADING, LOADING_MODULE } from '../../../store/mutation-types'
import FilterPopup from '@/components/list/partials/filter-popup'
export default { export default {
name: 'Kanban', name: 'Kanban',
components: { components: {
FilterPopup,
Container, Container,
Draggable, Draggable,
Labels, Labels,
User, User,
PriorityLabel, PriorityLabel,
Filters,
}, },
data() { data() {
return { return {

View File

@ -32,20 +32,18 @@
</span> </span>
</button> </button>
</div> </div>
<button @click="showTaskFilter = !showTaskFilter" class="button"> <button @click.prevent.stop="showTaskFilter = !showTaskFilter" class="button">
<span class="icon is-small"> <span class="icon is-small">
<icon icon="filter"/> <icon icon="filter"/>
</span> </span>
Filters Filters
</button> </button>
</div> </div>
<transition name="fade"> <filter-popup
<filters
@change="loadTasks(1)" @change="loadTasks(1)"
v-if="showTaskFilter" :visible="showTaskFilter"
v-model="params" v-model="params"
/> />
</transition>
</div> </div>
<div class="field task-add" v-if="!list.isArchived && canWrite && list.id > 0"> <div class="field task-add" v-if="!list.isArchived && canWrite && list.id > 0">
@ -174,9 +172,9 @@ import EditTask from '../../../components/tasks/edit-task'
import SingleTaskInList from '../../../components/tasks/partials/singleTaskInList' import SingleTaskInList from '../../../components/tasks/partials/singleTaskInList'
import taskList from '../../../components/tasks/mixins/taskList' import taskList from '../../../components/tasks/mixins/taskList'
import {saveListView} from '@/helpers/saveListView' import {saveListView} from '@/helpers/saveListView'
import Filters from '../../../components/list/partials/filters'
import Rights from '../../../models/rights.json' import Rights from '../../../models/rights.json'
import {mapState} from 'vuex' import {mapState} from 'vuex'
import FilterPopup from '@/components/list/partials/filter-popup'
export default { export default {
name: 'List', name: 'List',
@ -196,7 +194,7 @@ export default {
taskList, taskList,
], ],
components: { components: {
Filters, FilterPopup,
SingleTaskInList, SingleTaskInList,
EditTask, EditTask,
}, },

View File

@ -2,14 +2,14 @@
<div :class="{'is-loading': taskCollectionService.loading}" class="table-view loader-container"> <div :class="{'is-loading': taskCollectionService.loading}" class="table-view loader-container">
<div class="filter-container"> <div class="filter-container">
<div class="items"> <div class="items">
<button @click="() => {showActiveColumnsFilter = !showActiveColumnsFilter; showTaskFilter = false}" <button @click.prevent.stop="() => {showActiveColumnsFilter = !showActiveColumnsFilter; showTaskFilter = false}"
class="button"> class="button">
<span class="icon is-small"> <span class="icon is-small">
<icon icon="th"/> <icon icon="th"/>
</span> </span>
Columns Columns
</button> </button>
<button @click="() => {showTaskFilter = !showTaskFilter; showActiveColumnsFilter = false}" <button @click.prevent.stop="() => {showTaskFilter = !showTaskFilter; showActiveColumnsFilter = false}"
class="button"> class="button">
<span class="icon is-small"> <span class="icon is-small">
<icon icon="filter"/> <icon icon="filter"/>
@ -35,12 +35,12 @@
<fancycheckbox @change="saveTaskColumns" v-model="activeColumns.createdBy">Created By</fancycheckbox> <fancycheckbox @change="saveTaskColumns" v-model="activeColumns.createdBy">Created By</fancycheckbox>
</div> </div>
</div> </div>
<filters </transition>
<filter-popup
@change="loadTasks(1)" @change="loadTasks(1)"
v-if="showTaskFilter" :visible="showTaskFilter"
v-model="params" v-model="params"
/> />
</transition>
</div> </div>
<table class="table is-hoverable is-fullwidth"> <table class="table is-hoverable is-fullwidth">
@ -198,12 +198,12 @@ import DateTableCell from '../../../components/tasks/partials/date-table-cell'
import Fancycheckbox from '../../../components/input/fancycheckbox' import Fancycheckbox from '../../../components/input/fancycheckbox'
import Sort from '../../../components/tasks/partials/sort' import Sort from '../../../components/tasks/partials/sort'
import {saveListView} from '@/helpers/saveListView' import {saveListView} from '@/helpers/saveListView'
import Filters from '../../../components/list/partials/filters' import FilterPopup from '@/components/list/partials/filter-popup'
export default { export default {
name: 'Table', name: 'Table',
components: { components: {
Filters, FilterPopup,
Sort, Sort,
Fancycheckbox, Fancycheckbox,
DateTableCell, DateTableCell,