Fixed state card of number entity (#8325)

This commit is contained in:
Jaroslav Hanslík 2021-02-08 16:28:28 +01:00 committed by GitHub
parent 48de8b0739
commit e275f1f4b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -6,7 +6,6 @@ import { html } from "@polymer/polymer/lib/utils/html-tag";
/* eslint-plugin-disable lit */
import { PolymerElement } from "@polymer/polymer/polymer-element";
import "../components/entity/state-info";
import "../components/ha-slider";
class StateCardNumber extends mixinBehaviors(
[IronResizableBehavior],
@ -16,9 +15,6 @@ class StateCardNumber extends mixinBehaviors(
return html`
<style include="iron-flex iron-flex-alignment"></style>
<style>
ha-slider {
margin-left: auto;
}
.state {
@apply --paper-font-body1;
color: var(--primary-text-color);
@ -26,12 +22,6 @@ class StateCardNumber extends mixinBehaviors(
text-align: right;
line-height: 40px;
}
.sliderstate {
min-width: 45px;
}
ha-slider[hidden] {
display: none !important;
}
paper-input {
text-align: right;
margin-left: auto;
@ -40,19 +30,6 @@ class StateCardNumber extends mixinBehaviors(
<div class="horizontal justified layout" id="number_card">
${this.stateInfoTemplate}
<ha-slider
min="[[min]]"
max="[[max]]"
value="{{value}}"
step="[[step]]"
hidden="[[hiddenslider]]"
pin
on-change="selectedValueChanged"
on-click="stopPropagation"
id="slider"
ignore-bar-touch=""
>
</ha-slider>
<paper-input
no-label-float=""
auto-validate=""
@ -64,19 +41,11 @@ class StateCardNumber extends mixinBehaviors(
type="number"
on-change="selectedValueChanged"
on-click="stopPropagation"
hidden="[[hiddenbox]]"
>
</paper-input>
<div class="state" hidden="[[hiddenbox]]">
<div class="state">
[[stateObj.attributes.unit_of_measurement]]
</div>
<div
id="sliderstate"
class="state sliderstate"
hidden="[[hiddenslider]]"
>
[[value]] [[stateObj.attributes.unit_of_measurement]]
</div>
</div>
`;
}
@ -91,31 +60,9 @@ class StateCardNumber extends mixinBehaviors(
`;
}
ready() {
super.ready();
if (typeof ResizeObserver === "function") {
const ro = new ResizeObserver((entries) => {
entries.forEach(() => {
this.hiddenState();
});
});
ro.observe(this.$.number_card);
} else {
this.addEventListener("iron-resize", this.hiddenState);
}
}
static get properties() {
return {
hass: Object,
hiddenbox: {
type: Boolean,
value: true,
},
hiddenslider: {
type: Boolean,
value: true,
},
inDialog: {
type: Boolean,
value: false,
@ -138,35 +85,17 @@ class StateCardNumber extends mixinBehaviors(
},
step: Number,
value: Number,
mode: String,
};
}
hiddenState() {
if (this.mode !== "slider") return;
const sliderwidth = this.$.slider.offsetWidth;
if (sliderwidth < 100) {
this.$.sliderstate.hidden = true;
} else if (sliderwidth >= 145) {
this.$.sliderstate.hidden = false;
}
}
stateObjectChanged(newVal) {
const prevMode = this.mode;
this.setProperties({
min: Number(newVal.attributes.min),
max: Number(newVal.attributes.max),
step: Number(newVal.attributes.step),
value: Number(newVal.state),
mode: String(newVal.attributes.mode),
maxlength: String(newVal.attributes.max).length,
hiddenbox: newVal.attributes.mode !== "box",
hiddenslider: newVal.attributes.mode !== "slider",
});
if (this.mode === "slider" && prevMode !== "slider") {
this.hiddenState();
}
}
selectedValueChanged() {