Merge pull request #5865 from nextcloud/Fix/calendar-grid-event-click

Fix: can't click on widget event after conversation change in Talk
nextcloud · Mar 21, 2024 · 8c5c2ce · 8c5c2ce
2 parents 74523ae + 25069ad
commit 8c5c2ce
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/components/CalendarGrid.vue b/src/components/CalendarGrid.vue
@@ -119,7 +119,7 @@ export default {
 				editable: this.isEditable,
 				selectable: this.isAuthenticatedUser,
 				eventAllow,
-				eventClick: eventClick(this.$store, this.$router, this.$route, window, this.isWidget, this.$refs.fullCalendar),
+				eventClick: eventClick(this.$store, this.$router, this.$route, window, this.isWidget, this.$refs),
 				eventDrop: this.isWidget ? false : (...args) => eventDrop(this.$store, this.$refs.fullCalendar.getApi())(...args),
 				eventResize: this.isWidget ? false : eventResize(this.$store),
 				navLinkDayClick: this.isWidget ? false : navLinkDayClick(this.$router, this.$route),

diff --git a/src/fullcalendar/interaction/eventClick.js b/src/fullcalendar/interaction/eventClick.js
@@ -37,14 +37,14 @@ import { emit } from '@nextcloud/event-bus'
  * @param {object} route The current Vue route
  * @param {Window} window The window object
  * @param {boolean} isWidget Whether the calendar is embedded in a widget
- * @param {object} widgetRef
+ * @param {object} ref The ref object of CalendarGrid component
  * @return {Function}
  */
-export default function(store, router, route, window, isWidget = false, widgetRef = undefined) {
+export default function(store, router, route, window, isWidget = false, ref = undefined) {
 
 	return function({ event }) {
 		if (isWidget) {
-			store.commit('setWidgetRef', { widgetRef: widgetRef.$el })
+			store.commit('setWidgetRef', { widgetRef: ref.fullCalendar.$el })
 		}
 		switch (event.extendedProps.objectType) {
 		case 'VEVENT':