🔨 Fix name and add icon in more info

Fixes #251
timmo001 · Mar 30, 2019 · 10b8938 · 10b8938
1 parent 747bac5
commit 10b8938
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/src/Components/Cards/Hass/Dialogs/MoreInfo.js b/src/Components/Cards/Hass/Dialogs/MoreInfo.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import classnames from 'classnames';
 import PropTypes from 'prop-types';
 import withMobileDialog from '@material-ui/core/withMobileDialog';
 import Dialog from '@material-ui/core/Dialog';
@@ -63,6 +64,8 @@ class MoreInfo extends React.PureComponent {
     const { fullScreen, data, handleChange } = this.props;
     const { entity_id, attributes } = data;
     const domain = entity_id.substring(0, entity_id.indexOf('.'));
+    const name = data.name ? data.name : attributes.friendly_name;
+    const icon = data.icon && data.icon;
 
     return (
       <Dialog
@@ -71,7 +74,16 @@ class MoreInfo extends React.PureComponent {
         onClose={() => this.handleClose()}
         aria-labelledby="responsive-dialog-title">
         <DialogTitle id="responsive-dialog-title">
-          {attributes.friendly_name}
+          {icon && (
+            <span
+              className={classnames('mdi', `mdi-${icon}`)}
+              style={{
+                fontSize: data.size && data.size.icon && data.size.icon,
+                marginRight: 8
+              }}
+            />
+          )}
+          {name}
           <IconButton
             style={{
               position: 'absolute',

diff --git a/src/Components/Cards/Hass/Hass.js b/src/Components/Cards/Hass/Hass.js
@@ -51,10 +51,10 @@ class Hass extends React.PureComponent {
     alarmEntity: undefined
   };
 
-  handleButtonPress = (domain, entity) => {
+  handleButtonPress = (domain, entity, card) => {
     if (domain === 'light' && entity.state === 'on')
       this.buttonPressTimer = setTimeout(
-        () => this.setState({ moreInfo: entity }),
+        () => this.setState({ moreInfo: { ...entity, ...card } }),
         1000
       );
   };
@@ -222,8 +222,8 @@ class Hass extends React.PureComponent {
                 else if (domain === 'alarm_control_panel')
                   this.handleAlarmPanelShow(entity);
               }}
-              onTouchStart={() => this.handleButtonPress(domain, entity)}
-              onMouseDown={() => this.handleButtonPress(domain, entity)}
+              onTouchStart={() => this.handleButtonPress(domain, entity, card)}
+              onMouseDown={() => this.handleButtonPress(domain, entity, card)}
               onTouchEnd={this.handleButtonRelease}
               onMouseUp={this.handleButtonRelease}>
               <Card