From fd59d5f70c2066c33336fcd043a874c60d35fcdd Mon Sep 17 00:00:00 2001
From: Hamza <hamzamahjoubi221@gmail.com>
Date: Mon, 16 Feb 2026 21:44:42 +0100
Subject: [PATCH] fix: quick search filters

Signed-off-by: Hamza <hamzamahjoubi221@gmail.com>
---
 src/components/SearchMessages.vue | 62 ++++++++++++++++++++-----------
 1 file changed, 40 insertions(+), 22 deletions(-)

diff --git a/src/components/SearchMessages.vue b/src/components/SearchMessages.vue
index 8eaa6ca1ed..c5b8a8cbff 100644
--- a/src/components/SearchMessages.vue
+++ b/src/components/SearchMessages.vue
@@ -12,7 +12,7 @@
 				:placeholder="t('mail', 'Search in folder')"
 				:aria-label="t('mail', 'Search in folder')"
 				@focus="showButtons = true"
-				@blur="hideButtonsWithDelay">
+				@blur="hideButtonsWithDelay(true)">
 			<NcButton
 				variant="tertiary"
 				:aria-label="t('mail', 'Open search modal')"
@@ -280,7 +280,6 @@
 				:aria-label="t('mail', 'Has attachment')"
 				:title="t('mail', 'Has attachment')"
 				:pressed="hasAttachmentActive"
-				@update:pressed="hasAttachmentActive = !hasAttachmentActive"
 				@click="toggleGetAttachments">
 				{{ t('mail', 'Has attachment') }}
 			</NcButton>
@@ -290,7 +289,6 @@
 				:pressed="hasUnreadActive"
 				:aria-label="t('mail', 'Unread')"
 				:title="t('mail', 'Unread')"
-				@update:pressed="hasUnreadActive = !hasUnreadActive"
 				@click="toggleUnread">
 				{{ t('mail', 'Unread') }}
 			</NcButton>
@@ -300,7 +298,6 @@
 				:pressed="hasToMeActive"
 				:aria-label="t('mail', 'To me')"
 				:title="t('mail', 'To me')"
-				@update:pressed="hasToMeActive = !hasToMeActive"
 				@click="toggleCurrentUser">
 				{{ t('mail', 'To me') }}
 			</NcButton>
@@ -371,9 +368,6 @@ export default {
 			searchInMessageBody: null,
 			searchFlags: [],
 			mentionsMe: false,
-			hasAttachmentActive: false,
-			hasUnreadActive: false,
-			hasToMeActive: false,
 			startDate: null,
 			endDate: null,
 			dialogButtons: [
@@ -413,6 +407,22 @@ export default {
 			})
 		},
 
+		hasAttachmentActive() {
+			return this.searchFlags.includes('attachments')
+		},
+
+		hasUnreadActive() {
+			return this.searchFlags.includes('unread')
+		},
+
+		hasToMeActive() {
+			return this.searchInTo !== null && this.searchInTo[0]?.email === this.account.emailAddress
+		},
+
+		hasQuickFiltersActive() {
+			return this.hasAttachmentActive || this.hasUnreadActive || this.hasToMeActive
+		},
+
 		filterChanged() {
 			return Object.entries(this.filterData).filter(([key, val]) => {
 				return val !== '' && val !== null && val.length > 0
@@ -480,20 +490,33 @@ export default {
 			this.searchInTo = [{ email: this.query, label: this.query }]
 			this.debouncedSearchQuery()
 		},
+
+		hasQuickFiltersActive(newVal) {
+			if (!newVal) {
+				this.hideButtonsWithDelay()
+			}
+		},
 	},
 
 	methods: {
-		hideButtonsWithDelay() {
-			setTimeout(() => {
+		hideButtonsWithDelay(delay = false) {
+			if (delay) {
+				setTimeout(() => {
+					if (this.hasQuickFiltersActive) {
+						return
+					}
+					this.showButtons = false
+				}, 500)
+			} else {
 				this.showButtons = false
-			}, 100)
+			}
 		},
 
 		toggleGetAttachments() {
 			if (this.hasAttachmentActive) {
-				this.searchFlags.push('attachments')
-			} else {
 				this.searchFlags = this.searchFlags.filter((flag) => flag !== 'attachments')
+			} else {
+				this.searchFlags.push('attachments')
 			}
 			this.$nextTick(() => {
 				this.sendQueryEvent()
@@ -502,12 +525,12 @@ export default {
 
 		toggleCurrentUser() {
 			if (this.hasToMeActive) {
+				this.searchInTo = []
+			} else {
 				this.searchInTo = [{
 					email: this.account.emailAddress,
 					label: this.account.emailAddress,
 				}]
-			} else {
-				this.searchInTo = null
 			}
 			this.$nextTick(() => {
 				this.sendQueryEvent()
@@ -515,15 +538,10 @@ export default {
 		},
 
 		toggleUnread() {
-			if (this.hasUnreadActive) {
-				if (!Array.isArray(this.searchFlags)) {
-					this.searchFlags = []
-				}
-				if (!this.searchFlags.includes('unread')) {
-					this.searchFlags.push('unread')
-				}
-			} else {
+			if (this.searchFlags.includes('unread')) {
 				this.searchFlags = this.searchFlags.filter((flag) => flag !== 'unread')
+			} else {
+				this.searchFlags.push('unread')
 			}
 			this.$nextTick(() => {
 				this.sendQueryEvent()