Skip to content

Allow initial View in Calendar Card #6982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bramkragten merged 3 commits into from
Sep 25, 2020
Merged

Allow initial View in Calendar Card #6982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
203f4c6
allow inital view
zsarnett Sep 14, 2020
61f5ffa
lint
zsarnett Sep 14, 2020
f087ae8
comments
zsarnett Sep 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/panels/calendar/ha-full-calendar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// @ts-ignore
import fullcalendarStyle from "@fullcalendar/common/main.css";
import { Calendar } from "@fullcalendar/core";
import type { CalendarOptions } from "@fullcalendar/core";
import { Calendar } from "@fullcalendar/core";
import dayGridPlugin from "@fullcalendar/daygrid";
// @ts-ignore
import daygridStyle from "@fullcalendar/daygrid/main.css";
Expand Down Expand Up @@ -73,9 +73,11 @@ class HAFullCalendar extends LitElement {
"dayGridDay",
];

@property() public initialView: FullCalendarView = "dayGridMonth";

@internalProperty() private calendar?: Calendar;

@internalProperty() private _activeView: FullCalendarView = "dayGridMonth";
@internalProperty() private _activeView?: FullCalendarView;

protected render(): TemplateResult {
const viewToggleButtons = this._viewToggleButtons(this.views);
Expand Down Expand Up @@ -176,8 +178,11 @@ class HAFullCalendar extends LitElement {
this.calendar.addEventSource(this.events);
}

if (changedProps.has("views") && !this.views.includes(this._activeView)) {
this._activeView = this.views[0];
if (changedProps.has("views") && !this.views.includes(this._activeView!)) {
this._activeView =
this.initialView && this.views.includes(this.initialView)
? this.initialView
: this.views[0];
this.calendar!.changeView(this._activeView);
this._fireViewChanged();
}
Expand All @@ -187,8 +192,11 @@ class HAFullCalendar extends LitElement {
const config: CalendarOptions = {
...defaultFullCalendarConfig,
locale: this.hass.language,
initialView: this.initialView,
};

this._activeView = this.initialView;

config.dateClick = (info) => this._handleDateClick(info);
config.eventClick = (info) => this._handleEventClick(info);

Expand Down Expand Up @@ -237,7 +245,7 @@ class HAFullCalendar extends LitElement {

private _handleView(ev): void {
this._activeView = ev.detail.value;
this.calendar!.changeView(this._activeView);
this.calendar!.changeView(this._activeView!);
this._fireViewChanged();
}

Expand Down
29 changes: 14 additions & 15 deletions src/panels/lovelace/cards/hui-calendar-card.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,32 @@ import {
CSSResult,
customElement,
html,
internalProperty,
LitElement,
property,
PropertyValues,
TemplateResult,
internalProperty,
} from "lit-element";

import { HA_COLOR_PALETTE } from "../../../common/const";
import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
import { HASSDomEvent } from "../../../common/dom/fire_event";
import { debounce } from "../../../common/util/debounce";
import "../../../components/ha-card";
import "../../../components/ha-icon";
import "../../calendar/ha-full-calendar";

import { fetchCalendarEvents } from "../../../data/calendar";
import type {
HomeAssistant,
CalendarEvent,
Calendar,
CalendarEvent,
CalendarViewChanged,
FullCalendarView,
HomeAssistant,
} from "../../../types";
import type { LovelaceCard, LovelaceCardEditor } from "../types";
import type { CalendarCardConfig } from "./types";
import "../../calendar/ha-full-calendar";
import { findEntities } from "../common/find-entites";
import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
import "../components/hui-warning";
import { fetchCalendarEvents } from "../../../data/calendar";
import { HASSDomEvent } from "../../../common/dom/fire_event";
import { HA_COLOR_PALETTE } from "../../../common/const";
import { debounce } from "../../../common/util/debounce";
import { installResizeObserver } from "../common/install-resize-observer";
import "../components/hui-warning";
import type { LovelaceCard, LovelaceCardEditor } from "../types";
import type { CalendarCardConfig } from "./types";

@customElement("hui-calendar-card")
export class HuiCalendarCard extends LitElement implements LovelaceCard {
Expand Down Expand Up @@ -91,7 +89,7 @@ export class HuiCalendarCard extends LitElement implements LovelaceCard {
};
});

this._config = config;
this._config = { initial_view: "dayGridMonth", ...config };

@bramkragten bramkragten Sep 21, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The default already is dayGridMonth, so this is not needed?

@zsarnett zsarnett Sep 24, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, if this._config.initialView is undefined then we set it on the calendar as undefined. The property default gets overridden by Undefined. ifDefined directive is only for attributes I believe (or I didn't set it up correctly) so the default here is needed unless there is another way I have missed (which I am sure there is)

}

public getCardSize(): number {
Expand Down Expand Up @@ -126,6 +124,7 @@ export class HuiCalendarCard extends LitElement implements LovelaceCard {
.events=${this._events}
.hass=${this.hass}
.views=${views}
.initialView=${this._config.initial_view!}
@view-changed=${this._handleViewChanged}
></ha-full-calendar>
</ha-card>
Expand Down
2 changes: 2 additions & 0 deletions src/panels/lovelace/cards/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { ActionConfig, LovelaceCardConfig } from "../../../data/lovelace";
import { FullCalendarView } from "../../../types";
import { Condition } from "../common/validate-condition";
import { HuiImage } from "../components/hui-image";
import { LovelaceElementConfig } from "../elements/types";
Expand All @@ -14,6 +15,7 @@ export interface AlarmPanelCardConfig extends LovelaceCardConfig {

export interface CalendarCardConfig extends LovelaceCardConfig {
entities: string[];
initial_view?: FullCalendarView;
title?: string;
theme?: string;
}
Expand Down