From bc7101957300d82a3794ee33da1a8f65061d8939 Mon Sep 17 00:00:00 2001 From: Nathan Knotts Date: Fri, 20 Jul 2018 17:00:38 -0400 Subject: [PATCH] ha-cover-controls: handle opening/closing states (#1485) * ha-cover-controls: handle opening/closing states * added missing semi-colons * fixed entityObj reference --- src/components/ha-cover-controls.js | 4 ++-- src/util/cover-model.js | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/components/ha-cover-controls.js b/src/components/ha-cover-controls.js index dabaed7faa..949e0984e3 100644 --- a/src/components/ha-cover-controls.js +++ b/src/components/ha-cover-controls.js @@ -43,11 +43,11 @@ class HaCoverControls extends PolymerElement { } computeOpenDisabled(stateObj, entityObj) { var assumedState = stateObj.attributes.assumed_state === true; - return entityObj.isFullyOpen && !assumedState; + return (entityObj.isFullyOpen || entityObj.isOpening) && !assumedState; } computeClosedDisabled(stateObj, entityObj) { var assumedState = (stateObj.attributes.assumed_state === true); - return entityObj.isFullyClosed && !assumedState; + return (entityObj.isFullyClosed || entityObj.isClosing) && !assumedState; } onOpenTap(ev) { ev.stopPropagation(); diff --git a/src/util/cover-model.js b/src/util/cover-model.js index e829366b55..9997eebaaa 100644 --- a/src/util/cover-model.js +++ b/src/util/cover-model.js @@ -29,6 +29,14 @@ export default class CoverEntity { return this._attr.current_tilt_position === 0; } + get isOpening() { + return this.stateObj.state === 'opening'; + } + + get isClosing() { + return this.stateObj.state === 'closing'; + } + /* eslint-disable no-bitwise */ get supportsOpen() {