Skip to content

Convert date-range-picker to mwc #11755

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 1 commit into from
Feb 21, 2022
Merged

Convert date-range-picker to mwc #11755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 9 additions & 9 deletions src/components/ha-date-range-picker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import "@material/mwc-list/mwc-list";
import { ActionDetail } from "@material/mwc-list/mwc-list-foundation";
import "@material/mwc-list/mwc-list-item";
import { mdiCalendar } from "@mdi/js";
import "@polymer/paper-input/paper-input";
import {
css,
CSSResultGroup,
Expand All @@ -19,6 +18,7 @@ import { computeRTLDirection } from "../common/util/compute_rtl";
import { HomeAssistant } from "../types";
import "./date-range-picker";
import "./ha-svg-icon";
import "./ha-textfield";

export interface DateRangePickerRanges {
[key: string]: [Date, Date];
Expand Down Expand Up @@ -61,24 +61,24 @@ export class HaDateRangePicker extends LitElement {
>
<div slot="input" class="date-range-inputs">
<ha-svg-icon .path=${mdiCalendar}></ha-svg-icon>
<paper-input
<ha-textfield
.value=${formatDateTime(this.startDate, this.hass.locale)}
.label=${this.hass.localize(
"ui.components.date-range-picker.start_date"
)}
.disabled=${this.disabled}
@click=${this._handleInputClick}
readonly
></paper-input>
<paper-input
></ha-textfield>
<ha-textfield
.value=${formatDateTime(this.endDate, this.hass.locale)}
label=${this.hass.localize(
.label=${this.hass.localize(
"ui.components.date-range-picker.end_date"
)}
.disabled=${this.disabled}
@click=${this._handleInputClick}
readonly
></paper-input>
></ha-textfield>
</div>
${this.ranges
? html`<div
Expand Down Expand Up @@ -158,13 +158,13 @@ export class HaDateRangePicker extends LitElement {
border-top: 1px solid var(--divider-color);
}

paper-input {
ha-textfield {
display: inline-block;
max-width: 250px;
min-width: 200px;
}

paper-input:last-child {
ha-textfield:last-child {
margin-left: 8px;
}

Expand All @@ -176,7 +176,7 @@ export class HaDateRangePicker extends LitElement {
}

@media only screen and (max-width: 500px) {
paper-input {
ha-textfield {
min-width: inherit;
}

Expand Down
8 changes: 7 additions & 1 deletion src/panels/history/ha-panel-history.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class HaPanelHistory extends LitElement {
</app-header>

<div class="flex content">
<div class="flex layout horizontal wrap">
<div class="filters">
<ha-date-range-picker
.hass=${this.hass}
?disabled=${this._isLoading}
Expand Down Expand Up @@ -247,6 +247,12 @@ class HaPanelHistory extends LitElement {
position: relative;
}

.filters {
display: flex;
align-items: flex-end;
padding: 8px 16px 0;
}

ha-date-range-picker {
margin-right: 16px;
max-width: 100%;
Expand Down
2 changes: 1 addition & 1 deletion src/panels/logbook/ha-panel-logbook.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ export class HaPanelLogbook extends LitElement {
.filters {
display: flex;
align-items: flex-end;
padding: 0 16px;
padding: 8px 16px 0;
}

:host([narrow]) .filters {
Expand Down