jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-27 11:16:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't override ranges provided by parent (#18444)

Browse Source
This commit is contained in:
Bram Kragten 2023-10-27 15:47:47 +02:00 committed by GitHub
parent 4f09485b20
commit 54758b5962
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/ha-date-range-picker.ts
View File

@ -46,6 +46,8 @@ export class HaDateRangePicker extends LitElement {
@property() public ranges?: DateRangePickerRanges | false; @property() public ranges?: DateRangePickerRanges | false;
@state() private _ranges?: DateRangePickerRanges;
@property() public autoApply = false; @property() public autoApply = false;
@property() public timePicker = true; @property() public timePicker = true;
@ -93,7 +95,7 @@ export class HaDateRangePicker extends LitElement {
} }
); );
this.ranges = { this._ranges = {
[this.hass.localize("ui.components.date-range-picker.ranges.today")]: [ [this.hass.localize("ui.components.date-range-picker.ranges.today")]: [
calcDate(today, startOfDay, this.hass.locale, this.hass.config, { calcDate(today, startOfDay, this.hass.locale, this.hass.config, {
weekStartsOn, weekStartsOn,
@ -206,15 +208,15 @@ export class HaDateRangePicker extends LitElement {
.path=${mdiCalendar} .path=${mdiCalendar}
></ha-icon-button>`} ></ha-icon-button>`}
</div> </div>
${this.ranges ${this.ranges !== false && (this.ranges || this._ranges)
? html`<div ? html`<div
slot="ranges" slot="ranges"
class="date-range-ranges" class="date-range-ranges"
.dir=${this._rtlDirection} .dir=${this._rtlDirection}
> >
<mwc-list @action=${this._setDateRange} activatable> <mwc-list @action=${this._setDateRange} activatable>
${Object.keys(this.ranges).map( ${Object.keys(this.ranges || this._ranges!).map(
(name) => html`<mwc-list-item> ${name} </mwc-list-item>` (name) => html`<mwc-list-item>${name}</mwc-list-item>`
)} )}
</mwc-list> </mwc-list>
</div>` </div>`
@ -234,7 +236,9 @@ export class HaDateRangePicker extends LitElement {
} }
private _setDateRange(ev: CustomEvent<ActionDetail>) { private _setDateRange(ev: CustomEvent<ActionDetail>) {
const dateRange = Object.values(this.ranges!)[ev.detail.index]; const dateRange = Object.values(this.ranges || this._ranges!)[
ev.detail.index
];
const dateRangePicker = this._dateRangePicker; const dateRangePicker = this._dateRangePicker;
dateRangePicker.clickRange(dateRange); dateRangePicker.clickRange(dateRange);
dateRangePicker.clickedApply(); dateRangePicker.clickedApply();

2
src/panels/lovelace/components/hui-energy-period-selector.ts
View File

@ -65,7 +65,7 @@ export class HuiEnergyPeriodSelector extends SubscribeMixin(LitElement) {
@state() _endDate?: Date; @state() _endDate?: Date;
@state() private _ranges?: DateRangePickerRanges; @state() private _ranges: DateRangePickerRanges = {};
@state() private _compare = false; @state() private _compare = false;