Merge pull request #6425 from getkirby/fix/6422-calender-empty

CalendarInput: fix when no value
getkirby · May 2, 2024 · 2fa6396 · 2fa6396
2 parents b9ad2de + d5ae9c3
commit 2fa6396
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/panel/src/components/Forms/Input/CalendarInput.vue b/panel/src/components/Forms/Input/CalendarInput.vue
@@ -99,13 +99,15 @@ import { IsoDateProps } from "./DateInput.vue";
 export default {
 	mixins: [InputProps, IsoDateProps],
 	data() {
+		const today = this.$library.dayjs();
+
 		return {
 			maxdate: null,
 			mindate: null,
-			month: null,
+			month: today.month(),
 			selected: null,
-			today: this.$library.dayjs(),
-			year: null
+			today: today,
+			year: today.year()
 		};
 	},
 	computed: {
@@ -309,8 +311,10 @@ export default {
 		 * @param {number} day
 		 * @param {number} month
 		 */
-		toDate(day = 1, month = this.month) {
-			return this.$library.dayjs(`${this.year}-${month + 1}-${day}`);
+		toDate(day = 1, month) {
+			return this.$library.dayjs(
+				`${this.year}-${(month ?? this.month) + 1}-${day}`
+			);
 		},
 		/**
 		 * Generates select options between min and max