Skip to content

Fix updating columns #7171

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 6 commits into from
Sep 30, 2020
Merged

Fix updating columns #7171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e02d722
Fix updating columns
bramkragten Sep 30, 2020
ae80357
Console
bramkragten Sep 30, 2020
1f8ef70
Fix panel loop
bramkragten Sep 30, 2020
bcf2a48
guard masonary
bramkragten Sep 30, 2020
8498d60
fix typing
bramkragten Sep 30, 2020
1542cba
Update src/panels/lovelace/views/hui-masonry-view.ts
bramkragten Sep 30, 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
45 changes: 0 additions & 45 deletions src/panels/lovelace/ha-panel-lovelace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {
LitElement,
property,
internalProperty,
PropertyValues,
TemplateResult,
} from "lit-element";
import { domainToName } from "../../data/integration";
Expand Down Expand Up @@ -46,17 +45,13 @@ class LovelacePanel extends LitElement {

@property() public route?: Route;

@internalProperty() private _columns?: number;

@property()
private _state?: "loading" | "loaded" | "error" | "yaml-editor" = "loading";

@internalProperty() private _errorMsg?: string;

@internalProperty() private lovelace?: Lovelace;

private mqls?: MediaQueryList[];

private _ignoreNextUpdateEvent = false;

private _fetchConfigOnConnect = false;
Expand Down Expand Up @@ -105,7 +100,6 @@ class LovelacePanel extends LitElement {
.hass=${this.hass}
.lovelace=${this.lovelace}
.route=${this.route}
.columns=${this._columns}
.narrow=${this.narrow}
@config-refresh=${this._forceFetchConfig}
></hui-root>
Expand Down Expand Up @@ -144,25 +138,6 @@ class LovelacePanel extends LitElement {
`;
}

protected updated(changedProps: PropertyValues): void {
super.updated(changedProps);

if (changedProps.has("narrow")) {
this._updateColumns();
return;
}

if (!changedProps.has("hass")) {
return;
}

const oldHass = changedProps.get("hass") as this["hass"];

if (oldHass && this.hass!.dockedSidebar !== oldHass.dockedSidebar) {
this._updateColumns();
}
}

protected firstUpdated() {
this._fetchConfig(false);
if (!this._unsubUpdates) {
Expand All @@ -174,13 +149,6 @@ class LovelacePanel extends LitElement {
this._fetchConfig(false);
}
});
this._updateColumns = this._updateColumns.bind(this);
this.mqls = [300, 600, 900, 1200].map((width) => {
const mql = matchMedia(`(min-width: ${width}px)`);
mql.addListener(this._updateColumns);
return mql;
});
this._updateColumns();
}

private async _regenerateConfig() {
Expand All @@ -201,19 +169,6 @@ class LovelacePanel extends LitElement {
this._state = "loaded";
}

private _updateColumns() {
const matchColumns = this.mqls!.reduce(
(cols, mql) => cols + Number(mql.matches),
0
);
// Do -1 column if the menu is docked and open
this._columns = Math.max(
1,
matchColumns -
Number(!this.narrow && this.hass!.dockedSidebar === "docked")
);
}

private _lovelaceChanged() {
if (this._ignoreNextUpdateEvent) {
this._ignoreNextUpdateEvent = false;
Expand Down
21 changes: 13 additions & 8 deletions src/panels/lovelace/views/hui-masonry-view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,13 @@ export class MasonryView extends LitElement implements LovelaceViewElement {
}

protected firstUpdated(): void {
this._updateColumns = this._updateColumns.bind(this);
Copy link
Contributor

@zsarnett zsarnett Sep 30, 2020

Choose a reason for hiding this comment

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

I dont understand this part

Copy link
Member Author

@bramkragten bramkragten Sep 30, 2020

Choose a reason for hiding this comment

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

It would not use the context of the class, as the event listener would call it, it is the same as () => this._updateColumns()

Copy link
Contributor

@zsarnett zsarnett Sep 30, 2020

Choose a reason for hiding this comment

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

Oh that makes sense. 👍

this._mqls = [300, 600, 900, 1200].map((width) => {
const mql = matchMedia(`(min-width: ${width}px)`);
mql.addEventListener("change", this._updateColumns);
return mql;
});
this._updateColumns();
}

protected updated(changedProperties: PropertyValues): void {
Expand Down Expand Up @@ -130,11 +132,14 @@ export class MasonryView extends LitElement implements LovelaceViewElement {
}
}

const oldLovelace = changedProperties.get("lovelace") as Lovelace;
const oldLovelace = changedProperties.get("lovelace") as
| Lovelace
| undefined;

if (
oldLovelace?.config !== this.lovelace?.config ||
oldLovelace?.editMode !== this.lovelace?.editMode ||
(changedProperties.has("lovelace") && (
oldLovelace?.config !== this.lovelace?.config ||
oldLovelace?.editMode !== this.lovelace?.editMode)) ||
changedProperties.has("_columns")
) {
this._createColumns();
Expand Down Expand Up @@ -237,6 +242,9 @@ export class MasonryView extends LitElement implements LovelaceViewElement {
}

private _updateColumns() {
if (!this._mqls) {
return;
}
const matchColumns = this._mqls!.reduce(
(cols, mql) => cols + Number(mql.matches),
0
Expand All @@ -260,6 +268,8 @@ export class MasonryView extends LitElement implements LovelaceViewElement {
display: flex;
flex-direction: row;
justify-content: center;
margin-left: 4px;
margin-right: 4px;
}

.column {
Expand Down Expand Up @@ -288,11 +298,6 @@ export class MasonryView extends LitElement implements LovelaceViewElement {
}

@media (max-width: 500px) {
:host {
padding-left: 0;
padding-right: 0;
}

.column > * {
margin-left: 0;
margin-right: 0;
Expand Down
8 changes: 7 additions & 1 deletion src/panels/lovelace/views/hui-panel-view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,13 @@ export class PanelView extends LitElement implements LovelaceViewElement {
);
}

const oldLovelace = changedProperties.get("lovelace") as Lovelace;
if (!changedProperties.has("lovelace")) {
return;
}

const oldLovelace = changedProperties.get("lovelace") as
| Lovelace
| undefined;

if (
oldLovelace?.config !== this.lovelace?.config ||
Expand Down