Skip to content

A platform for community discussion. Free, open, simple.

FIX: clicking calendar day fires composer discard modal (#40477)

jlzlta8b9219b1124
diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/full-calendar.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/full-calendar.gjs
index 22557fb646b..2219d77e685 100644
--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/full-calendar.gjs
+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/full-calendar.gjs
@@ -143,9 +143,6 @@ export default class FullCalendar extends Component {
});
}
},
- dateClick: async (info) => {
- await this.args.onDateClick?.(info);
- },
eventClick: async ({ el, event, jsEvent }) => {
const { postNumber, postUrl, postEvent } = event.extendedProps;
@@ -179,8 +176,8 @@ export default class FullCalendar extends Component {
},
allDayContent: () =>
i18n("discourse_post_event.upcoming_events_list.all_day"),
- select: (info) => {
- this.args.onDateClick?.(info);
+ select: async (info) => {
+ await this.args.onDateClick?.(info);
},
});
diff --git a/plugins/discourse-calendar/test/javascripts/acceptance/calendar-click-to-create-test.js b/plugins/discourse-calendar/test/javascripts/acceptance/calendar-click-to-create-test.js
index 7e01d844a6c..353774e6048 100644
--- a/plugins/discourse-calendar/test/javascripts/acceptance/calendar-click-to-create-test.js
+++ b/plugins/discourse-calendar/test/javascripts/acceptance/calendar-click-to-create-test.js
@@ -91,6 +91,10 @@ acceptance(
await click(".fc-day-today");
await waitFor(".d-editor-input");
+ assert
+ .dom(".discard-draft-modal")
+ .doesNotExist("discard modal does not appear on a single click");
+
assert
.dom(".d-editor-input")
.hasValue(
@@ -171,6 +175,10 @@ acceptance(
await click(".fc-day-today");
await waitFor(".d-editor-input");
+ assert
+ .dom(".discard-draft-modal")
+ .doesNotExist("discard modal does not appear on a single click");
+
assert
.dom(".d-editor-input")
.hasValue(