From 0007c306726622eaccf9ba6f63434dbfb5aaabaf Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sun, 8 May 2022 22:39:23 +0200
Subject: [PATCH] feat: move filter popup to a modal

---
 src/components/list/partials/filter-popup.vue | 48 ++++++++++---------
 src/components/list/partials/filters.vue      |  6 ++-
 src/components/misc/modal.vue                 |  3 --
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/components/list/partials/filter-popup.vue b/src/components/list/partials/filter-popup.vue
index 90a00ea6b..d8d94906f 100644
--- a/src/components/list/partials/filter-popup.vue
+++ b/src/components/list/partials/filter-popup.vue
@@ -6,39 +6,34 @@
 	>
 		{{ $t('filters.clear') }}
 	</x-button>
-	<popup :has-overflow="true">
-		<template #trigger="{toggle}">
-			<x-button
-				@click.prevent.stop="toggle()"
-				variant="secondary"
-				icon="filter"
-			>
-				{{ $t('filters.title') }}
-			</x-button>
-		</template>
-		<template #content="{isOpen}">
-			<filters
-				v-model="value"
-				ref="filters"
-				class="filter-popup"
-				:class="{'is-open': isOpen}"
-			/>
-		</template>
-	</popup>
+	<x-button
+		@click="() => modalOpen = true"
+		variant="secondary"
+		icon="filter"
+	>
+		{{ $t('filters.title') }}
+	</x-button>
+	<modal @close="() => modalOpen = false" :enabled="modalOpen">
+		<filters
+			:has-title="true"
+			v-model="value"
+			ref="filters"
+			class="filter-popup"
+			:class="{'is-open': isOpen}"
+		/>
+	</modal>
 </template>
 
 <script lang="ts">
-import {defineComponent} from 'vue'
+import {defineComponent, ref} from 'vue'
 
-import Filters from '@/components/list/partials/filters'
-import Popup from '@/components/misc/popup'
+import Filters from '@/components/list/partials/filters.vue'
 
 import {getDefaultParams} from '@/composables/taskList'
 
 export default defineComponent({
 	name: 'filter-popup',
 	components: {
-		Popup,
 		Filters,
 	},
 	props: {
@@ -82,6 +77,13 @@ export default defineComponent({
 			immediate: true,
 		},
 	},
+	setup() {
+		const modalOpen = ref(false)
+
+		return {
+			modalOpen,
+		}
+	},
 	methods: {
 		clearFilters() {
 			this.value = {...getDefaultParams()}
diff --git a/src/components/list/partials/filters.vue b/src/components/list/partials/filters.vue
index f9dd5746f..61878e413 100644
--- a/src/components/list/partials/filters.vue
+++ b/src/components/list/partials/filters.vue
@@ -1,5 +1,5 @@
 <template>
-	<card class="filters has-overflow">
+	<card class="filters has-overflow" :title="hasTitle ? $t('filters.title') : ''">
 		<div class="field">
 			<fancycheckbox v-model="params.filter_include_nulls">
 				{{ $t('filters.attributes.includeNulls') }}
@@ -263,6 +263,10 @@ export default defineComponent({
 		modelValue: {
 			required: true,
 		},
+		hasTitle: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	emits: ['update:modelValue', 'change'],
 	watch: {
diff --git a/src/components/misc/modal.vue b/src/components/misc/modal.vue
index 38d4dccf8..249bc1fe0 100644
--- a/src/components/misc/modal.vue
+++ b/src/components/misc/modal.vue
@@ -91,9 +91,6 @@ watch(
 		scrollLock.value = enabled
 		store.commit('modalActive', enabled)
 	},
-	{
-		immediate: true,
-	},
 )
 </script>