From 778c93699a0fa9dab5aac26e275f0413f6236d4a Mon Sep 17 00:00:00 2001
From: Antonia Schwennesen <53372671+zophiana@users.noreply.github.com>
Date: Sat, 1 Feb 2025 08:54:59 +0100
Subject: [PATCH 1/2] fix(calendar-list): restrict calendar visibility toggle
to checkbox only
Previously, clicking anywhere on the calendar name would toggle its visibility,
leading to accidental hiding of calendars. Now the visibility can only be
toggled by clicking the checkbox/bullet icon.
Fixes #3027
Signed-off-by: Antonia Schwennesen <53372671+zophiana@users.noreply.github.com>
---
.../AppNavigation/CalendarList/CalendarListItem.vue | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/components/AppNavigation/CalendarList/CalendarListItem.vue b/src/components/AppNavigation/CalendarList/CalendarListItem.vue
index fee0ee0c5d..7fc13ecd30 100644
--- a/src/components/AppNavigation/CalendarList/CalendarListItem.vue
+++ b/src/components/AppNavigation/CalendarList/CalendarListItem.vue
@@ -8,15 +8,16 @@
:aria-description="descriptionAppNavigationItem"
:name="calendarDisplayName || $t('calendar', 'Untitled calendar')"
:class="{deleted: isBeingDeleted, disabled: !calendar.enabled}"
- @click.prevent.stop="toggleEnabled"
@update:menuOpen="actionsMenuOpen = $event">
+ :fill-color="calendar.color"
+ @click.prevent.stop="toggleEnabled" />
+ :fill-color="calendar.color"
+ @click.prevent.stop="toggleEnabled" />
From d94ca1c39b0f16bf78a16bfdcbb7fe4f51e5f27a Mon Sep 17 00:00:00 2001
From: Antonia Schwennesen <53372671+zophiana@users.noreply.github.com>
Date: Sat, 1 Feb 2025 09:03:45 +0100
Subject: [PATCH 2/2] fix(public-calendar): remove toggle functionality from
public view
The enabled state cannot be persisted in public views, so the toggle
functionality should not be available. Remove click handler from bullet
icon to prevent misleading interaction.
Co-authored-by: Richard Steinmetz
Signed-off-by: Antonia Schwennesen <53372671+zophiana@users.noreply.github.com>
---
.../AppNavigation/CalendarList/PublicCalendarListItem.vue | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/components/AppNavigation/CalendarList/PublicCalendarListItem.vue b/src/components/AppNavigation/CalendarList/PublicCalendarListItem.vue
index dde60f6936..374eaaaa8e 100644
--- a/src/components/AppNavigation/CalendarList/PublicCalendarListItem.vue
+++ b/src/components/AppNavigation/CalendarList/PublicCalendarListItem.vue
@@ -6,12 +6,9 @@
+ :menu-open.sync="menuOpen">
-
+