Merge v2.3.7 from dcapslock/2.3.7

v2.3.7

Author: dcapslock

custom_components/browser_mod/browser_mod.js

@@ -446,7 +446,7 @@ function e(e,t,i,o){var s,n=arguments.length,r=n<3?t:null===o?o=Object.getOwnPro
         display: flex;
         align-items: center;
       }
-    `}}e([le()],_e.prototype,"hass",void 0),e([de()],_e.prototype,"_dashboards",void 0),e([de()],_e.prototype,"_editSidebar",void 0),customElements.define("browser-mod-frontend-settings-card",_e);var fe="2.3.6";(async()=>{var e,t,i,o,s,n,r,a,l,d,h,c,u,p,g;await customElements.whenDefined("partial-panel-resolver");const w=document.createElement("partial-panel-resolver")._getRoutes([{component_name:"config",url_path:"a"}]);await(null===(i=null===(t=null===(e=null==w?void 0:w.routes)||void 0===e?void 0:e.a)||void 0===t?void 0:t.load)||void 0===i?void 0:i.call(t)),await customElements.whenDefined("ha-panel-config");const v=document.createElement("ha-panel-config");await(null===(r=null===(n=null===(s=null===(o=null==v?void 0:v.routerOptions)||void 0===o?void 0:o.routes)||void 0===s?void 0:s.dashboard)||void 0===n?void 0:n.load)||void 0===r?void 0:r.call(n)),await(null===(h=null===(d=null===(l=null===(a=null==v?void 0:v.routerOptions)||void 0===a?void 0:a.routes)||void 0===l?void 0:l.general)||void 0===d?void 0:d.load)||void 0===h?void 0:h.call(d)),await(null===(g=null===(p=null===(u=null===(c=null==v?void 0:v.routerOptions)||void 0===c?void 0:c.routes)||void 0===u?void 0:u.entities)||void 0===p?void 0:p.load)||void 0===g?void 0:g.call(p)),await customElements.whenDefined("ha-config-dashboard")})().then((()=>{class t extends se{firstUpdated(){window.addEventListener("browser-mod-config-update",(()=>this.requestUpdate()))}render(){var e;return window.browser_mod?M`
+    `}}e([le()],_e.prototype,"hass",void 0),e([de()],_e.prototype,"_dashboards",void 0),e([de()],_e.prototype,"_editSidebar",void 0),customElements.define("browser-mod-frontend-settings-card",_e);var fe="2.3.7";(async()=>{var e,t,i,o,s,n,r,a,l,d,h,c,u,p,g;await customElements.whenDefined("partial-panel-resolver");const w=document.createElement("partial-panel-resolver")._getRoutes([{component_name:"config",url_path:"a"}]);await(null===(i=null===(t=null===(e=null==w?void 0:w.routes)||void 0===e?void 0:e.a)||void 0===t?void 0:t.load)||void 0===i?void 0:i.call(t)),await customElements.whenDefined("ha-panel-config");const v=document.createElement("ha-panel-config");await(null===(r=null===(n=null===(s=null===(o=null==v?void 0:v.routerOptions)||void 0===o?void 0:o.routes)||void 0===s?void 0:s.dashboard)||void 0===n?void 0:n.load)||void 0===r?void 0:r.call(n)),await(null===(h=null===(d=null===(l=null===(a=null==v?void 0:v.routerOptions)||void 0===a?void 0:a.routes)||void 0===l?void 0:l.general)||void 0===d?void 0:d.load)||void 0===h?void 0:h.call(d)),await(null===(g=null===(p=null===(u=null===(c=null==v?void 0:v.routerOptions)||void 0===c?void 0:c.routes)||void 0===u?void 0:u.entities)||void 0===p?void 0:p.load)||void 0===g?void 0:g.call(p)),await customElements.whenDefined("ha-config-dashboard")})().then((()=>{class t extends se{firstUpdated(){window.addEventListener("browser-mod-config-update",(()=>this.requestUpdate()))}render(){var e;return window.browser_mod?M`
         <ha-top-app-bar-fixed>
           <ha-menu-button
             slot="navigationIcon"

custom_components/browser_mod/browser_mod_panel.js

@@ -13,5 +13,5 @@
   "documentation": "https://github.com/dcapslock/hass-browser_mod/blob/master/README.md",
   "iot_class": "local_push",
   "requirements": [],
-  "version": "2.3.6"
+  "version": "2.3.7"
 }

custom_components/browser_mod/manifest.json

@@ -273,14 +273,14 @@ navigate:
           multiple: true
           filter:
             integration: "browser_mod"
-      user_id:
-        name: Target User
-        description: ""
-        selector:
-          entity:
-            multiple: true
-            filter:
-              domain: "person"
+    user_id:
+      name: Target User
+      description: ""
+      selector:
+        entity:
+          multiple: true
+          filter:
+            domain: "person"
     path:
       name: Path
       description: "Target path"

custom_components/browser_mod/services.yaml

@@ -11,7 +11,7 @@ import {
 } from "../helpers";
 import { loadHaForm } from "../helpers";
 
-const CLOSE_POPUP_ACTIONS = new Set(["assist", "more-info"]);
+const CLOSE_POPUP_ACTIONS = new Set(["assist"]);
 
 class BrowserModPopup extends LitElement {
   @property() open;
@@ -98,7 +98,10 @@ class BrowserModPopup extends LitElement {
       (customElements.get("card-mod") as any)?.applyToElement?.(
         this,
         "more-info",
-        this.card_mod?.style ?? ""
+        this.card_mod?.style ? { style: this.card_mod.style, debug: this.card_mod?.debug ?? false } : "",
+        {},
+        true,
+        "browser_mod-card_mod"
       );
     });
 
@@ -504,17 +507,22 @@ export const PopupMixin = (SuperClass) => {
       });
 
       this._popupEl.addEventListener("hass-action", async (ev: CustomEvent) => {
-        if (
-          (ev.detail.action === "tap" &&
-            CLOSE_POPUP_ACTIONS.has(ev.detail.config?.tap_action?.action)) ||
-          (ev.detail.action === "hold" &&
-            CLOSE_POPUP_ACTIONS.has(ev.detail.config?.hold_action?.action)) ||
-          (ev.detail.action === "double_tap" &&
-            CLOSE_POPUP_ACTIONS.has(
-              ev.detail.config?.double_tap_action?.action
-            ))
-        ) {
-          this._popupEl.do_close();
+        const actionType = ev.detail.action;
+        if (actionType) {
+          const actionConfig = ev.detail?.config?.[`${actionType}_action`];        
+          if (actionConfig) {
+            if (actionConfig.action === "more-info") {
+              ev.stopPropagation();
+              this.showMoreInfo(
+                actionConfig.entity ? actionConfig.entity : ev.detail.config.entity,
+                actionConfig.large ?? false,
+                actionConfig.ignore_popup_card ?? false,
+              );
+              return;
+            } else if (CLOSE_POPUP_ACTIONS.has(actionConfig.action)){
+              this._popupEl.do_close();
+            }
+          }
         }
         ev.stopPropagation();
         const base = await hass_base_el();

js/plugin/popups.ts

@@ -77,11 +77,13 @@ export const ServicesMixin = (SuperClass) => {
           const { title, content, ...d } = data;
           for (var [k, v] of Object.entries<any>(d)) {
             if (k.endsWith("_action")) {
+              let actions = v; // Force Closure. See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Closures#creating_closures_in_loops_a_common_mistake
+              let key = k; // If required use key in anonymous function to avoid closure issue as per above comment
               d[k] = (ext_data?) => {
-                if (!Array.isArray(v)) {
-                  v = [v];
+                if (!Array.isArray(actions)) {
+                  actions = [actions];
                 }
-                v.forEach((actionItem) => {
+                actions.forEach((actionItem) => {
                   var { action, service, target, data } = actionItem as any;
                   service = action ?? service;
                   this._service_action({

js/plugin/services.ts

@@ -1,7 +1,7 @@
 {
   "name": "browser_mod",
   "private": true,
-  "version": "2.3.6",
+  "version": "2.3.7",
   "description": "",
   "scripts": {
     "build": "rollup -c",