Fix mixin names (#1849)

This commit is contained in:
Paulus Schoutsen 2018-10-24 12:10:58 +02:00 committed by GitHub
parent 06bf134bd4
commit 47fb8a5513
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 16 deletions

View File

@ -6,18 +6,18 @@ import {
} from "@polymer/lit-element"; } from "@polymer/lit-element";
import { HomeAssistant } from "../types"; import { HomeAssistant } from "../types";
import { import {
LocalizeBaseMixin, localizeBaseMixin,
LocalizeFunc, LocalizeFunc,
LocalizeMixin, LocalizeMixin,
} from "./localize-base-mixin"; } from "./localize-base-mixin";
const empty = () => ""; const empty = () => "";
export const HassLocalizeLitMixin = <T extends LitElement>( export const hassLocalizeLitMixin = <T extends LitElement>(
superClass: Constructor<T> superClass: Constructor<T>
): Constructor<T & LocalizeMixin> => ): Constructor<T & LocalizeMixin> =>
// @ts-ignore // @ts-ignore
class extends LocalizeBaseMixin(superClass) { class extends localizeBaseMixin(superClass) {
protected hass?: HomeAssistant; protected hass?: HomeAssistant;
protected localize!: LocalizeFunc; protected localize!: LocalizeFunc;

View File

@ -35,7 +35,7 @@ export interface LocalizeMixin {
localize: LocalizeFunc; localize: LocalizeFunc;
} }
export const LocalizeBaseMixin = (superClass) => export const localizeBaseMixin = (superClass) =>
class extends superClass { class extends superClass {
/** /**
* Returns a computed `localize` method, based on the current `language`. * Returns a computed `localize` method, based on the current `language`.

View File

@ -2,7 +2,7 @@
* Lite mixin to add localization without depending on the Hass object. * Lite mixin to add localization without depending on the Hass object.
*/ */
import { dedupingMixin } from "@polymer/polymer/lib/utils/mixin.js"; import { dedupingMixin } from "@polymer/polymer/lib/utils/mixin.js";
import { LocalizeBaseMixin } from "./localize-base-mixin"; import { localizeBaseMixin } from "./localize-base-mixin";
import { import {
getActiveTranslation, getActiveTranslation,
getTranslation, getTranslation,
@ -13,7 +13,7 @@ import {
*/ */
export default dedupingMixin( export default dedupingMixin(
(superClass) => (superClass) =>
class extends LocalizeBaseMixin(superClass) { class extends localizeBaseMixin(superClass) {
static get properties() { static get properties() {
return { return {
language: { language: {

View File

@ -1,5 +1,5 @@
import { dedupingMixin } from "@polymer/polymer/lib/utils/mixin.js"; import { dedupingMixin } from "@polymer/polymer/lib/utils/mixin.js";
import { LocalizeBaseMixin } from "./localize-base-mixin"; import { localizeBaseMixin } from "./localize-base-mixin";
/** /**
* Polymer Mixin to enable a localize function powered by language/resources from hass object. * Polymer Mixin to enable a localize function powered by language/resources from hass object.
* *
@ -7,7 +7,7 @@ import { LocalizeBaseMixin } from "./localize-base-mixin";
*/ */
export default dedupingMixin( export default dedupingMixin(
(superClass) => (superClass) =>
class extends LocalizeBaseMixin(superClass) { class extends localizeBaseMixin(superClass) {
static get properties() { static get properties() {
return { return {
hass: Object, hass: Object,

View File

@ -11,7 +11,7 @@ import computeStateName from "../../../common/entity/compute_state_name.js";
import applyThemesOnElement from "../../../common/dom/apply_themes_on_element.js"; import applyThemesOnElement from "../../../common/dom/apply_themes_on_element.js";
import { styleMap } from "lit-html/directives/styleMap.js"; import { styleMap } from "lit-html/directives/styleMap.js";
import { HomeAssistant } from "../../../types.js"; import { HomeAssistant } from "../../../types.js";
import { HassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin"; import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
import { LovelaceCard, LovelaceConfig } from "../types.js"; import { LovelaceCard, LovelaceConfig } from "../types.js";
interface Config extends LovelaceConfig { interface Config extends LovelaceConfig {
@ -24,7 +24,7 @@ interface Config extends LovelaceConfig {
service_data?: object; service_data?: object;
} }
class HuiEntityButtonCard extends HassLocalizeLitMixin(LitElement) class HuiEntityButtonCard extends hassLocalizeLitMixin(LitElement)
implements LovelaceCard { implements LovelaceCard {
public hass?: HomeAssistant; public hass?: HomeAssistant;
protected config?: Config; protected config?: Config;

View File

@ -13,7 +13,7 @@ import "../../../components/ha-card.js";
import "../../../components/ha-icon.js"; import "../../../components/ha-icon.js";
import { fireEvent } from "../../../common/dom/fire_event.js"; import { fireEvent } from "../../../common/dom/fire_event.js";
import { HassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin"; import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
import { HomeAssistant } from "../../../types.js"; import { HomeAssistant } from "../../../types.js";
import { LovelaceCard, LovelaceConfig } from "../types.js"; import { LovelaceCard, LovelaceConfig } from "../types.js";
@ -35,7 +35,7 @@ interface Config extends LovelaceConfig {
columns?: number; columns?: number;
} }
export class HuiGlanceCard extends HassLocalizeLitMixin(LitElement) export class HuiGlanceCard extends hassLocalizeLitMixin(LitElement)
implements LovelaceCard { implements LovelaceCard {
public hass?: HomeAssistant; public hass?: HomeAssistant;
protected config?: Config; protected config?: Config;
@ -49,7 +49,9 @@ export class HuiGlanceCard extends HassLocalizeLitMixin(LitElement)
} }
public getCardSize() { public getCardSize() {
return (this.config!.title ? 1 : 0) + Math.ceil(this.configEntities!.length / 5); return (
(this.config!.title ? 1 : 0) + Math.ceil(this.configEntities!.length / 5)
);
} }
public setConfig(config: Config) { public setConfig(config: Config) {
@ -86,7 +88,9 @@ export class HuiGlanceCard extends HassLocalizeLitMixin(LitElement)
${this.renderStyle()} ${this.renderStyle()}
<ha-card .header="${title}"> <ha-card .header="${title}">
<div class="entities ${classMap({ "no-header": !title })}"> <div class="entities ${classMap({ "no-header": !title })}">
${this.configEntities!.map(entityConf => this.renderEntity(entityConf))} ${this.configEntities!.map((entityConf) =>
this.renderEntity(entityConf)
)}
</div> </div>
</ha-card> </ha-card>
`; `;

View File

@ -10,8 +10,7 @@ interface Config extends LovelaceConfig {
url: string; url: string;
} }
export class HuiIframeCard extends LitElement export class HuiIframeCard extends LitElement implements LovelaceCard {
implements LovelaceCard {
protected config?: Config; protected config?: Config;
static get properties() { static get properties() {