Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
bramkragten committed Jun 4, 2024
2 parents 52f3ff3 + cd62f06 commit 8ff8c01
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 20 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "home-assistant-frontend"
version = "20240603.0"
version = "20240604.0"
license = {text = "Apache-2.0"}
description = "The Home Assistant frontend"
readme = "README.md"
Expand Down
8 changes: 4 additions & 4 deletions src/data/zwave_js.ts
Original file line number Diff line number Diff line change
Expand Up @@ -487,14 +487,14 @@ export const stopZwaveExclusion = (hass: HomeAssistant, entry_id: string) =>
export const zwaveGrantSecurityClasses = (
hass: HomeAssistant,
entry_id: string,
security_classes: SecurityClass[],
client_side_auth?: boolean
securityClasses: SecurityClass[],
clientSideAuth?: boolean
) =>
hass.callWS({
type: "zwave_js/grant_security_classes",
entry_id,
security_classes,
client_side_auth,
securityClasses,
clientSideAuth,
});

export const zwaveTryParseDskFromQrCode = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ class DialogAutomationMode extends LitElement implements HassDialog {
type="number"
name="max"
.value=${this._newMax?.toString() ?? ""}
@change=${this._valueChanged}
@input=${this._valueChanged}
class="max"
>
</ha-textfield>
Expand Down
14 changes: 6 additions & 8 deletions src/panels/lovelace/cards/hui-entity-filter-card.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,12 @@ export class HuiEntityFilterCard
return false;
});

if (
entitiesList.length === 0 &&
this._config.show_empty === false &&
!this.hidden
) {
this.style.display = "none";
this.toggleAttribute("hidden", true);
fireEvent(this, "card-visibility-changed", { value: false });
if (entitiesList.length === 0 && this._config.show_empty === false) {
if (!this.hidden) {
this.style.display = "none";
this.toggleAttribute("hidden", true);
fireEvent(this, "card-visibility-changed", { value: false });
}
return;
}

Expand Down
16 changes: 10 additions & 6 deletions src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,11 @@ export class HuiDialogEditCard
--dialog-content-padding: 24px 12px;
}
.content {
width: calc(90vw - 48px);
max-width: 1000px;
}
@media all and (max-width: 450px), all and (max-height: 500px) {
/* overrule the ha-style-dialog max-height on small screens */
ha-dialog {
Expand All @@ -425,16 +430,15 @@ export class HuiDialogEditCard
--dialog-surface-top: 0px;
--mdc-dialog-max-width: 100vw;
}
}
.content {
width: 1000px;
max-width: calc(90vw - 48px);
.content {
width: 100%;
max-width: 100%;
}
}
@media all and (min-width: 451px) and (min-height: 501px) {
:host([large]) .content {
width: calc(90vw - 48px);
max-width: none;
}
}
Expand Down
7 changes: 7 additions & 0 deletions src/panels/lovelace/hui-root.ts
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,13 @@ class HUIRoot extends LitElement {
});
}

public connectedCallback(): void {
super.connectedCallback();
window.addEventListener("scroll", this._handleWindowScroll, {
passive: true,
});
}

public disconnectedCallback(): void {
super.disconnectedCallback();
window.removeEventListener("scroll", this._handleWindowScroll);
Expand Down

0 comments on commit 8ff8c01

Please sign in to comment.