From 346eb78c4e333cfa3417c378b5ad739f50d6f448 Mon Sep 17 00:00:00 2001 From: Yosi Levy Date: Sat, 18 Jul 2020 06:29:21 +0300 Subject: [PATCH 1/8] Fixed extra space issue + RTL support when no entries --- src/panels/logbook/ha-logbook.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/panels/logbook/ha-logbook.ts b/src/panels/logbook/ha-logbook.ts index 8b6d8bc36a..5944fc0fc2 100644 --- a/src/panels/logbook/ha-logbook.ts +++ b/src/panels/logbook/ha-logbook.ts @@ -19,6 +19,7 @@ import "../../components/ha-icon"; import { LogbookEntry } from "../../data/logbook"; import { HomeAssistant } from "../../types"; import { restoreScroll } from "../../common/decorators/restore-scroll"; +import { classMap } from "lit-html/directives/class-map"; class HaLogbook extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; @@ -48,7 +49,7 @@ class HaLogbook extends LitElement { protected render(): TemplateResult { if (!this.entries?.length) { return html` -
+
${this.hass.localize("ui.panel.logbook.entries_not_found")}
`; @@ -106,9 +107,8 @@ class HaLogbook extends LitElement { @click=${this._entityClicked} .entityId=${item.entity_id} class="name" + >${item.name} - ${item.name} - `} ${item.message}${item_username @@ -177,6 +177,9 @@ class HaLogbook extends LitElement { .container { padding: 0 16px; } + .container.rtl { + direction: rtl; + } .uni-virtualizer-host { display: block; From 80bc6fda8b2bfe7fef18f13d244a63f66a703b86 Mon Sep 17 00:00:00 2001 From: Yosi Levy Date: Sat, 18 Jul 2020 06:31:33 +0300 Subject: [PATCH 2/8] Improved --- src/panels/logbook/ha-logbook.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/panels/logbook/ha-logbook.ts b/src/panels/logbook/ha-logbook.ts index 5944fc0fc2..9090e10904 100644 --- a/src/panels/logbook/ha-logbook.ts +++ b/src/panels/logbook/ha-logbook.ts @@ -49,7 +49,7 @@ class HaLogbook extends LitElement { protected render(): TemplateResult { if (!this.entries?.length) { return html` -
+
${this.hass.localize("ui.panel.logbook.entries_not_found")}
`; From 06c7b0b82ec91a9bfa65a022fd3b580bf18bf99e Mon Sep 17 00:00:00 2001 From: Yosi Levy Date: Sat, 18 Jul 2020 10:59:48 +0300 Subject: [PATCH 3/8] Optimized --- src/common/util/compute_rtl.ts | 6 +++++- src/panels/logbook/ha-logbook.ts | 9 +++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/common/util/compute_rtl.ts b/src/common/util/compute_rtl.ts index 343ec34307..d73bf8f859 100644 --- a/src/common/util/compute_rtl.ts +++ b/src/common/util/compute_rtl.ts @@ -9,5 +9,9 @@ export function computeRTL(hass: HomeAssistant) { } export function computeRTLDirection(hass: HomeAssistant) { - return computeRTL(hass) ? "rtl" : "ltr"; + return emitRTLDirection(computeRTL(hass)); +} + +export function emitRTLDirection(rtl: boolean) { + return rtl ? "rtl" : "ltr"; } diff --git a/src/panels/logbook/ha-logbook.ts b/src/panels/logbook/ha-logbook.ts index 9090e10904..946fd1972e 100644 --- a/src/panels/logbook/ha-logbook.ts +++ b/src/panels/logbook/ha-logbook.ts @@ -14,12 +14,11 @@ import { formatTimeWithSeconds } from "../../common/datetime/format_time"; import { fireEvent } from "../../common/dom/fire_event"; import { domainIcon } from "../../common/entity/domain_icon"; import { stateIcon } from "../../common/entity/state_icon"; -import { computeRTL } from "../../common/util/compute_rtl"; +import { computeRTL, emitRTLDirection } from "../../common/util/compute_rtl"; import "../../components/ha-icon"; import { LogbookEntry } from "../../data/logbook"; import { HomeAssistant } from "../../types"; import { restoreScroll } from "../../common/decorators/restore-scroll"; -import { classMap } from "lit-html/directives/class-map"; class HaLogbook extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; @@ -39,7 +38,9 @@ class HaLogbook extends LitElement { const oldHass = changedProps.get("hass") as HomeAssistant | undefined; const languageChanged = oldHass === undefined || oldHass.language !== this.hass.language; - return changedProps.has("entries") || languageChanged; + const rtlChanged = + oldHass === undefined || computeRTL(oldHass) !== computeRTL(this.hass); + return changedProps.has("entries") || languageChanged || rtlChanged; } protected updated(_changedProps: PropertyValues) { @@ -49,7 +50,7 @@ class HaLogbook extends LitElement { protected render(): TemplateResult { if (!this.entries?.length) { return html` -
+
${this.hass.localize("ui.panel.logbook.entries_not_found")}
`; From 88d5e7dd5ea47fecf617a279bf134b9d53748952 Mon Sep 17 00:00:00 2001 From: Yosi Levy Date: Sat, 18 Jul 2020 11:02:13 +0300 Subject: [PATCH 4/8] Line breaks From d4ae74de44a94a009e78652cc606ebbf3ccf6a08 Mon Sep 17 00:00:00 2001 From: Yosi Levy Date: Sat, 18 Jul 2020 11:06:43 +0300 Subject: [PATCH 5/8] Removed style --- src/panels/logbook/ha-logbook.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/panels/logbook/ha-logbook.ts b/src/panels/logbook/ha-logbook.ts index 946fd1972e..9aa797dd6b 100644 --- a/src/panels/logbook/ha-logbook.ts +++ b/src/panels/logbook/ha-logbook.ts @@ -178,9 +178,6 @@ class HaLogbook extends LitElement { .container { padding: 0 16px; } - .container.rtl { - direction: rtl; - } .uni-virtualizer-host { display: block; From 07e68496c05ad11e5b37fb71015a89fe39542dab Mon Sep 17 00:00:00 2001 From: Yosi Levy Date: Sun, 19 Jul 2020 06:14:09 +0300 Subject: [PATCH 6/8] Removed directive --- src/panels/logbook/ha-logbook.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/panels/logbook/ha-logbook.ts b/src/panels/logbook/ha-logbook.ts index 9aa797dd6b..d4a15714ae 100644 --- a/src/panels/logbook/ha-logbook.ts +++ b/src/panels/logbook/ha-logbook.ts @@ -28,7 +28,6 @@ class HaLogbook extends LitElement { @property() public entries: LogbookEntry[] = []; @property({ attribute: "rtl", type: Boolean, reflect: true }) - // @ts-ignore private _rtl = false; // @ts-ignore From f7ae5b91bf6054833e4dd8126481339a59f9ce26 Mon Sep 17 00:00:00 2001 From: Yosi Levy Date: Sun, 19 Jul 2020 14:17:09 +0300 Subject: [PATCH 7/8] Remove rtl update check --- src/panels/logbook/ha-logbook.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/panels/logbook/ha-logbook.ts b/src/panels/logbook/ha-logbook.ts index d4a15714ae..cc46f31da6 100644 --- a/src/panels/logbook/ha-logbook.ts +++ b/src/panels/logbook/ha-logbook.ts @@ -37,9 +37,8 @@ class HaLogbook extends LitElement { const oldHass = changedProps.get("hass") as HomeAssistant | undefined; const languageChanged = oldHass === undefined || oldHass.language !== this.hass.language; - const rtlChanged = - oldHass === undefined || computeRTL(oldHass) !== computeRTL(this.hass); - return changedProps.has("entries") || languageChanged || rtlChanged; + + return changedProps.has("entries") || languageChanged; } protected updated(_changedProps: PropertyValues) { From 0afc7c184fb28c6b524c3806d7da58f2d8f80b85 Mon Sep 17 00:00:00 2001 From: Yosi Levy Date: Mon, 20 Jul 2020 13:25:34 +0300 Subject: [PATCH 8/8] Fixed comments --- src/panels/logbook/ha-logbook.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/panels/logbook/ha-logbook.ts b/src/panels/logbook/ha-logbook.ts index cc46f31da6..3fb8bf7a0c 100644 --- a/src/panels/logbook/ha-logbook.ts +++ b/src/panels/logbook/ha-logbook.ts @@ -42,7 +42,11 @@ class HaLogbook extends LitElement { } protected updated(_changedProps: PropertyValues) { - this._rtl = computeRTL(this.hass); + const oldHass = _changedProps.get("hass") as HomeAssistant | undefined; + + if (oldHass === undefined || oldHass.language !== this.hass.language) { + this._rtl = computeRTL(this.hass); + } } protected render(): TemplateResult {