Skip to content

Add image type for picture-elements card. #1428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 3 commits into from
Jul 12, 2018
Merged

Add image type for picture-elements card. #1428

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0ffc83
Add image type for picture-elements.
jeradM Jul 9, 2018
6d71351
Rebased master. Move overflow rule to parent.
jeradM Jul 11, 2018
29662d4
Cleaned up click handler.
jeradM Jul 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 48 additions & 7 deletions src/panels/lovelace/cards/hui-picture-elements-card.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,19 @@ import '../../../components/entity/ha-state-label-badge.js';
import '../../../components/entity/state-badge.js';
import '../../../components/ha-icon.js';
import '../../../components/ha-card.js';
import '../components/hui-image.js';

import computeStateDisplay from '../../../common/entity/compute_state_display.js';
import computeStateName from '../../../common/entity/compute_state_name.js';
import computeDomain from '../../../common/entity/compute_domain';
import toggleEntity from '../common/entity/toggle-entity.js';

import EventsMixin from '../../../mixins/events-mixin.js';
import LocalizeMixin from '../../../mixins/localize-mixin.js';
import NavigateMixin from '../../../mixins/navigate-mixin.js';

const VALID_TYPES = new Set([
'image',
'navigation',
'service-button',
'state-badge',
Expand Down Expand Up @@ -58,6 +61,9 @@ class HuiPictureElementsCard extends NavigateMixin(EventsMixin(LocalizeMixin(Pol
color: var(--primary-color);
white-space: nowrap;
}
hui-image {
overflow-y: hidden;
}
</style>

<ha-card header="[[_config.title]]">
Expand All @@ -81,6 +87,7 @@ class HuiPictureElementsCard extends NavigateMixin(EventsMixin(LocalizeMixin(Pol
this._stateBadges = [];
this._stateIcons = [];
this._stateLabels = [];
this._images = [];
}

ready() {
Expand Down Expand Up @@ -139,13 +146,13 @@ class HuiPictureElementsCard extends NavigateMixin(EventsMixin(LocalizeMixin(Pol
break;
case 'state-icon':
el = document.createElement('state-badge');
el.addEventListener('click', () => this._handleClick(entityId, element.tap_action === 'toggle'));
el.addEventListener('click', () => this._handleClick(element));
el.classList.add('clickable');
this._stateIcons.push({ el, entityId });
break;
case 'state-label':
el = document.createElement('div');
el.addEventListener('click', () => this._handleClick(entityId, false));
el.addEventListener('click', () => this._handleClick(element));
el.classList.add('clickable', 'state-label');
this._stateLabels.push({ el, entityId });
break;
Expand All @@ -156,6 +163,23 @@ class HuiPictureElementsCard extends NavigateMixin(EventsMixin(LocalizeMixin(Pol
el.title = element.navigation_path;
el.classList.add('clickable');
break;
case 'image':
el = document.createElement('hui-image');
el.hass = this.hass;
el.entity = element.entity;
el.image = element.image;
el.stateImage = element.state_image;
el.filter = element.filter;
el.stateFilter = element.state_filter;
if (!element.camera_image && computeDomain(element.entity) === 'camera') {
el.cameraImage = element.entity;
} else {
el.cameraImage = element.camera_image;
}
this._images.push(el);
if (element.tap_action === 'none') break;
el.addEventListener('click', () => this._handleClick(element));
el.classList.add('clickable');
}

el.classList.add('element');
Expand Down Expand Up @@ -197,17 +221,34 @@ class HuiPictureElementsCard extends NavigateMixin(EventsMixin(LocalizeMixin(Pol
el.title = '';
}
});

this._images.forEach((el) => {
el.hass = hass;
});
}

_computeTooltip(stateObj) {
return `${computeStateName(stateObj)}: ${computeStateDisplay(this.localize, stateObj)}`;
}

_handleClick(entityId, toggle) {
if (toggle) {
toggleEntity(this.hass, entityId);
} else {
this.fire('hass-more-info', { entityId });
_handleClick(elementConfig) {
const tapAction = elementConfig.tap_action || 'more_info';

switch (tapAction) {
case 'more_info':
this.fire('hass-more-info', { entityId: elementConfig.entity });
break;
case 'toggle':
toggleEntity(this.hass, elementConfig.entity);
break;
case 'call_service': {
const [domain, service] = elementConfig.service.split('.', 2);
const serviceData = Object.assign(
{}, { entity_id: elementConfig.entity },
elementConfig.service_data
);
this.hass.callService(domain, service, serviceData);
}
}
}
}
Expand Down