jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-24 09:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use layout property for panel view (#21418)

Browse Source
This commit is contained in:
Paul Bottein 2024-07-19 11:53:46 +02:00 committed by GitHub
parent 38e7b8c467
commit 6e29b77e94
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/panels/lovelace/cards/hui-card.ts
View File

@ -25,8 +25,6 @@ declare global {
export class HuiCard extends ReactiveElement {
@property({ type: Boolean }) public preview = false;
@property({ attribute: false }) public isPanel = false;
@property({ attribute: false }) public config?: LovelaceCardConfig;
@property({ attribute: false }) public hass?: HomeAssistant;
@ -178,11 +176,14 @@ export class HuiCard extends ReactiveElement {
this._loadElement(createErrorCardConfig(e.message, null));
}
}
if (changedProps.has("isPanel")) {
this._element.isPanel = this.isPanel;
}
if (changedProps.has("layout")) {
this._element.layout = this.layout;
try {
this._element.layout = this.layout;
// For backwards compatibility
(this._element as any).isPanel = this.layout === "panel";
} catch (e: any) {
this._loadElement(createErrorCardConfig(e.message, null));
}
}
}

4
src/panels/lovelace/cards/hui-entity-filter-card.ts
View File

@ -53,7 +53,7 @@ export class HuiEntityFilterCard
@property({ attribute: false }) public hass?: HomeAssistant;
@property({ type: Boolean }) public isPanel = false;
@property({ attribute: false }) public layout?: string;
@property({ type: Boolean }) public preview = false;
@ -118,7 +118,7 @@ export class HuiEntityFilterCard
if (this._element) {
this._element.hass = this.hass;
this._element.preview = this.preview;
this._element.isPanel = this.isPanel;
this._element.layout = this.layout;
}
if (changedProps.has("_config")) {

5
src/panels/lovelace/cards/hui-iframe-card.ts
View File

@ -29,9 +29,6 @@ export class HuiIframeCard extends LitElement implements LovelaceCard {
};
}
@property({ type: Boolean, reflect: true })
public isPanel = false;
@property({ attribute: false })
public layout?: string;
@ -63,7 +60,7 @@ export class HuiIframeCard extends LitElement implements LovelaceCard {
}
let padding = "";
const ignoreAspectRatio = this.isPanel || this.layout === "grid";
const ignoreAspectRatio = this.layout === "panel" || this.layout === "grid";
if (!ignoreAspectRatio) {
if (this._config.aspect_ratio) {
const ratio = parseAspectRatio(this._config.aspect_ratio);

8
src/panels/lovelace/cards/hui-map-card.ts
View File

@ -54,11 +54,7 @@ interface MapEntityConfig extends EntityConfig {
class HuiMapCard extends LitElement implements LovelaceCard {
@property({ attribute: false }) public hass!: HomeAssistant;
@property({ type: Boolean, reflect: true })
public isPanel = false;
@property({ attribute: false })
public layout?: string;
@property({ attribute: false }) public layout?: string;
@state() private _stateHistory?: HistoryStates;
@ -301,7 +297,7 @@ class HuiMapCard extends LitElement implements LovelaceCard {
private _computePadding(): void {
const root = this.shadowRoot!.getElementById("root");
const ignoreAspectRatio = this.isPanel || this.layout === "grid";
const ignoreAspectRatio = this.layout === "panel" || this.layout === "grid";
if (!this._config || ignoreAspectRatio || !root) {
return;
}

7
src/panels/lovelace/cards/hui-stack-card.ts
View File

@ -29,8 +29,7 @@ export abstract class HuiStackCard<T extends StackCardConfig = StackCardConfig>
@state() protected _config?: T;
@property({ type: Boolean, reflect: true })
public isPanel = false;
@property({ attribute: false }) public layout?: string;
public getCardSize(): number | Promise<number> {
return 1;
@ -62,6 +61,10 @@ export abstract class HuiStackCard<T extends StackCardConfig = StackCardConfig>
});
}
}
if (changedProperties.has("layout")) {
this.toggleAttribute("ispanel", this.layout === "panel");
}
}
private _createCardElement(cardConfig: LovelaceCardConfig) {

1
src/panels/lovelace/types.ts
View File

@ -51,7 +51,6 @@ export type LovelaceLayoutOptions = {
export interface LovelaceCard extends HTMLElement {
hass?: HomeAssistant;
isPanel?: boolean;
preview?: boolean;
layout?: string;
getCardSize(): number | Promise<number>;

2
src/panels/lovelace/views/hui-panel-view.ts
View File

@ -105,7 +105,7 @@ export class PanelView extends LitElement implements LovelaceViewElement {
}
const card: HuiCard = this.cards[0];
card.isPanel = true;
card.layout = "panel";
if (this.isStrategy || !this.lovelace?.editMode) {
card.preview = false;