Fix Service Call

Sian-Lee-SA · Dec 30, 2022 · 3dc2033 · 3dc2033
1 parent 352cd65
commit 3dc2033
Show file tree

Hide file tree

Showing 3 changed files with 309 additions and 171 deletions.
diff --git a/honeycomb-menu.js b/honeycomb-menu.js
diff --git a/src/honeycomb-menu-item.js b/src/honeycomb-menu-item.js
@@ -10,6 +10,7 @@
 import { objectEvalTemplate, getTemplateOrValue } from "./helpers.js";
 
 var cardTools = customElements.get('card-tools');
+const _ = require('lodash');
 
 class HoneycombMenuItem extends Polymer.Element
 {
@@ -95,6 +96,11 @@ class HoneycombMenuItem extends Polymer.Element
                 pointer-events: all;
                 height: 100%;
             }
+
+            #item > * {
+                height: 100%;
+            }
+            
             :host([disabled]) #item {
                 background: var(--honeycomb-menu-disabled, #9a9a9a6e);
             }
@@ -127,6 +133,13 @@ class HoneycombMenuItem extends Polymer.Element
             variables: {},
         }, this.config);
 
+        if( _.isString( this.config.tap_action ) )
+            this.config.tap_action = {'action':this.config.tap_action};
+        if( _.isString( this.config.hold_action ) )
+            this.config.hold_action = {'action':this.config.hold_action};
+        if( _.isString( this.config.double_tap_action ) )
+            this.config.double_tap_action = {'action':this.config.double_tap_action};
+
         if( ! this.config.active )
             this.style.setProperty('--paper-item-icon-active-color', 'var(--paper-item-icon-color)');
 

diff --git a/src/honeycomb-menu.js b/src/honeycomb-menu.js
@@ -93,10 +93,12 @@ function traverseConfigs( _config, _buttons )
 }
 
 hass._callService = hass.callService
-hass.callService = function(domain, service, data)
+hass.callService = function(domain, service, data, target)
 {
+
     if( domain != 'honeycomb' )
-        return hass._callService(domain, service, data);
+        return hass._callService(domain, service, data, target);
+
 
     var honeycombConfig = traverseConfigs( data );
 
@@ -106,6 +108,7 @@ hass.callService = function(domain, service, data)
     showHoneycombMenu(honeycombConfig);
 }
 
+customElements.whenDefined('card-tools').then(() => {
 class HoneycombMenu extends Polymer.Element
 {
     static get is()
@@ -511,3 +514,4 @@ class HoneycombMenu extends Polymer.Element
     }
 }
 customElements.define(HoneycombMenu.is, HoneycombMenu);
+});