diff --git a/src/data/calendar.ts b/src/data/calendar.ts index 807fb5e3c7..819bbee25d 100644 --- a/src/data/calendar.ts +++ b/src/data/calendar.ts @@ -29,6 +29,7 @@ export interface CalendarEventData { dtstart: string; dtend: string; rrule?: string; + description?: string; } export interface CalendarEventMutableParams { @@ -36,6 +37,7 @@ export interface CalendarEventMutableParams { dtstart: string; dtend: string; rrule?: string; + description?: string; } // The scope of a delete/update for a recurring event @@ -84,6 +86,7 @@ export const fetchCalendarEvents = async ( const eventData: CalendarEventData = { uid: ev.uid, summary: ev.summary, + description: ev.description, dtstart: eventStart, dtend: eventEnd, recurrence_id: ev.recurrence_id, diff --git a/src/panels/calendar/dialog-calendar-event-detail.ts b/src/panels/calendar/dialog-calendar-event-detail.ts index e5a6aaca00..9776a9e784 100644 --- a/src/panels/calendar/dialog-calendar-event-detail.ts +++ b/src/panels/calendar/dialog-calendar-event-detail.ts @@ -87,6 +87,11 @@ class DialogCalendarEventDetail extends LitElement { ${this._data!.rrule ? this._renderRruleAsText(this._data.rrule) : ""} + ${this._data.description + ? html`
+
${this._data.description}
+
` + : html``} @@ -239,6 +244,11 @@ class DialogCalendarEventDetail extends LitElement { .field { display: flex; } + .description { + color: var(--secondary-text-color); + max-width: 300px; + overflow-wrap: break-word; + } `, ]; } diff --git a/src/panels/calendar/dialog-calendar-event-editor.ts b/src/panels/calendar/dialog-calendar-event-editor.ts index 6c29ab0d80..7316f27dc3 100644 --- a/src/panels/calendar/dialog-calendar-event-editor.ts +++ b/src/panels/calendar/dialog-calendar-event-editor.ts @@ -7,6 +7,7 @@ import { customElement, property, state } from "lit/decorators"; import memoizeOne from "memoize-one"; import { isDate } from "../../common/string/is_date"; import "../../components/ha-date-input"; +import "../../components/ha-textarea"; import "../../components/ha-time-input"; import { Calendar, @@ -42,6 +43,8 @@ class DialogCalendarEventEditor extends LitElement { @state() private _summary = ""; + @state() private _description = ""; + @state() private _rrule?: string; @state() private _allDay = false; @@ -127,6 +130,15 @@ class DialogCalendarEventEditor extends LitElement { error-message=${this.hass.localize("ui.common.error_required")} dialogInitialFocus > +