Merge pull request #1086 from thomasloven/dev

v2.6.4

Author: dcapslock

custom_components/browser_mod/browser_mod.js

@@ -546,7 +546,7 @@ function e(e,t,i,s){var o,n=arguments.length,r=n<3?t:null===s?s=Object.getOwnPro
         display: flex;
         align-items: center;
       }
-    `}}e([ae()],Ee.prototype,"hass",void 0),e([le()],Ee.prototype,"_dashboards",void 0),e([le()],Ee.prototype,"_panels",void 0),e([le()],Ee.prototype,"_editSidebar",void 0),e([le()],Ee.prototype,"_hassUserHasSidebarSettings",void 0),customElements.define("browser-mod-frontend-settings-card",Ee);var xe="2.6.3";(async()=>{var e,t,i,s,o,n,r,a,l,d,h,c,u,p,g;await customElements.whenDefined("partial-panel-resolver");const b=document.createElement("partial-panel-resolver")._getRoutes([{component_name:"config",url_path:"a"}]);await(null===(i=null===(t=null===(e=null==b?void 0:b.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===(o=null===(s=null==v?void 0:v.routerOptions)||void 0===s?void 0:s.routes)||void 0===o?void 0:o.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?j`
+    `}}e([ae()],Ee.prototype,"hass",void 0),e([le()],Ee.prototype,"_dashboards",void 0),e([le()],Ee.prototype,"_panels",void 0),e([le()],Ee.prototype,"_editSidebar",void 0),e([le()],Ee.prototype,"_hassUserHasSidebarSettings",void 0),customElements.define("browser-mod-frontend-settings-card",Ee);var xe="2.6.4";(async()=>{var e,t,i,s,o,n,r,a,l,d,h,c,u,p,g;await customElements.whenDefined("partial-panel-resolver");const b=document.createElement("partial-panel-resolver")._getRoutes([{component_name:"config",url_path:"a"}]);await(null===(i=null===(t=null===(e=null==b?void 0:b.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===(o=null===(s=null==v?void 0:v.routerOptions)||void 0===s?void 0:s.routes)||void 0===o?void 0:o.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?j`
         <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/thomasloven/hass-browser_mod/blob/master/README.md",
   "iot_class": "local_push",
   "requirements": [],
-  "version": "2.6.3"
+  "version": "2.6.4"
 }

custom_components/browser_mod/manifest.json

@@ -84,7 +84,7 @@ popup:
     content:
       name: Content
       required: true
-      description: "Popup content (Test or lovelace card configuration)"
+      description: "Popup content (Text or lovelace card configuration)"
       selector:
         object:
     initial_style:
@@ -305,6 +305,12 @@ more_info:
       default: false
       selector:
         boolean:
+    close:
+      name: Close existing more-info dialog
+      description: Close the more-info dialog if open
+      default: false
+      selector:
+        boolean:
 
 close_popup:
   name: close_popup
@@ -634,4 +640,4 @@ deregister_browser:
         area:
           multiple: true
           entity:
-            integration: "browser_mod"
+            integration: "browser_mod"

custom_components/browser_mod/services.yaml

@@ -188,6 +188,7 @@ data:
   [view: <INFO/history/settings/related]
   [large: <true/FALSE>]
   [ignore_popup_card: <true/FALSE>]
+  [close: true/FALSE>]
   [browser_id: <Browser IDs>]
   [user_id: <User IDs>]
 ```
@@ -198,11 +199,10 @@ data:
 |`view`| The more-info view to open. The view opened will always have a close icon. Setting the view to anything other than `info` will always ignore custom popup-cards. |
 |`large`| If true, the dialog will be displayed wider, as if you had clicked the title of the dialog. |
 |`ignore_popup_card` | If true the more-info dialog will be shown even if there's currently a popup-card in the view/dashboard(*) which would override it. |
+|`close` | If true the more-into dialog will be closed if open. All other parameters are ignored. |
 
 *\* Dashboard when popup-card config has `popup_card_all_views: true`.*
 
-> NOTE: You can close an open more-info dialog by calling `browser_mod.more_info` with no entity.
-
 ## `browser_mod.popup`
 
 Display a popup dialog. You can use a `custom:popup-card` as a template and optionally override parameters, or start from scratch specifying `content` and parameters. To display plaintext, HTML or a form, you need to use `content` as these are not avaulable using a `custom:popup-card`.

documentation/services.md

@@ -84,14 +84,22 @@ export const PanelStateMixin = (SuperClass) => {
     _panelAttributes(panel) {
       return {
         panelTitle: this._panelTitle(panel),
-        panelUrlPath: panel?.panel?.url_path || "",
+        panelUrlPath: panel?.route?.prefix?.replace(/^\/|\/$/g, "") || "",
         panelComponentName: panel?.panel?.component_name || "",
         panelIcon: panel?.panel?.icon || "",
+        panelNarrow: panel?.narrow || false,
+        panelRequireAdmin: panel?.panel?.require_admin || false,
       };
     }
 
     async _viewAttributes(panel) {
-      if (panel?.panel?.component_name !== "lovelace") return {};
+      if (panel?.panel?.component_name !== "lovelace") {
+        return {
+          viewTitle: "",
+          viewUrlPath: panel?.route?.path?.replace(/^\/|\/$/g, "") || "",
+          viewNarrow: panel?.narrow || false,
+        };
+      }
       let cnt = 0;
       while (!panel.shadowRoot?.querySelector("hui-root") && cnt < 10) {
         await new Promise((resolve) => setTimeout(resolve, 1000));
@@ -102,7 +110,7 @@ export const PanelStateMixin = (SuperClass) => {
       const _curView = lovelace._curView || 0;
       return {
         viewTitle: lovelace.config?.views?.[_curView]?.title || "",
-        viewUrlPath: lovelace.config?.views?.[_curView]?.path || "",
+        viewUrlPath: lovelace.config?.views?.[_curView]?.path || `${_curView}`,
         viewNarrow: lovelace.narrow,
       };
     }
@@ -113,16 +121,29 @@ export const PanelStateMixin = (SuperClass) => {
         const panel = await this._getPanel(document);
         const panelAttributes = this._panelAttributes(panel);
         const viewAttributes = await this._viewAttributes(panel);
-        const fullTitle = panelAttributes.panelTitle + (viewAttributes.viewTitle ? ` - ${viewAttributes.viewTitle}` : "");
-        const fullUrlPath = panelAttributes.panelUrlPath + (viewAttributes.viewUrlPath ? `/${viewAttributes.viewUrlPath}` : "");
+        const fullTitle = [];
+        if (panelAttributes.panelTitle) {
+          fullTitle.push(panelAttributes.panelTitle);
+        }
+        if (viewAttributes.viewTitle) {
+          fullTitle.push(viewAttributes.viewTitle);
+        }
+        const fullUrlPath = [];
+        if (panelAttributes.panelUrlPath) {
+          fullUrlPath.push(panelAttributes.panelUrlPath);
+        }
+        if (viewAttributes.viewUrlPath) {
+          fullUrlPath.push(viewAttributes.viewUrlPath);
+        }
         this.sendUpdate({
           panel: {
-            title: fullTitle,
+            title: fullTitle.join(" - "),
             attributes: {
               ...panelAttributes,
               ...viewAttributes,
-              fullUrlPath: fullUrlPath,
-              popupOpen: window.browser_mod?.popupState
+              fullUrlPath: fullUrlPath.join("/"),
+              popupOpen: window.browser_mod?.popupState,
+              openPopups: window.browser_mod?.openPopups,
             }
           }
         });

js/plugin/panel.ts

@@ -58,6 +58,12 @@ export class BrowserModPopup extends LitElement {
       this,
       (value: boolean) => { this._formDataValid = value }
     );
+    // When reopening popup, keep style attributes
+    // but make sure they are all set to false
+    this._styleAttributes = this._styleAttributes || [];
+    Object.keys(this._styleAttributes).forEach((key) => {
+      this._styleAttributes[key] = false;
+    });
   }
 
   updated(_changedProperties: PropertyValues): void {
@@ -112,7 +118,6 @@ export class BrowserModPopup extends LitElement {
     Object.keys(this._styleAttributes).forEach((key) => {
       key.split(" ").forEach((k) => this.removeAttribute(k));
     });
-    this._styleAttributes = [];
     this._styleSequenceIndex = undefined;
     return true;
   }
@@ -288,7 +293,6 @@ export class BrowserModPopup extends LitElement {
     this.card = undefined;
     this.card_mod = card_mod;
     this._initialStyle = initial_style ?? size ?? "normal";
-    this._styleAttributes = [];
     this._popupStyles = popup_styles;
     this._styleSequence = ensureArray(style_sequence ?? []);
     this._styleSequence = this._styleSequence.length > 0 ? this._styleSequence : ["wide", "normal"];

js/plugin/popup-dialog.ts

@@ -1,4 +1,3 @@
-import { LitElement } from "lit";
 import {
   loadLoadCardHelpers,
   hass_base_el,
@@ -19,6 +18,12 @@ export const PopupMixin = (SuperClass) => {
       this._popupState = false;
     }
 
+    get openPopups(): string[] {
+      return this._popupElements
+        .filter((popup) => popup.open === true)
+        .map((popup) => popup.tag !== undefined ? popup.tag : "standard");
+    }
+
     get popupState() {
       return this._popupElements.some((popup) => popup.open === true);
     }
@@ -64,8 +69,17 @@ export const PopupMixin = (SuperClass) => {
       }
     }
 
-    async showMoreInfo(entityId, view = "info", large = false, ignore_popup_card = undefined) {
+    async showMoreInfo(entityId, view = "info", large = false, ignore_popup_card = undefined, close = false) {
       const base = await hass_base_el();
+      if (close) {
+        // Provide a close option as the empty entity id method can cause issues
+        // with camera stream audio tracks staying active
+        const dialog: any = base.shadowRoot.querySelector(
+          "ha-more-info-dialog"
+        );
+        if (dialog) dialog.closeDialog();
+        return;
+      }
       base.dispatchEvent(
         new CustomEvent("hass-more-info", {
           bubbles: true,

js/plugin/popups.ts

@@ -74,8 +74,8 @@ export const ServicesMixin = (SuperClass) => {
           break;
 
         case "more_info":
-          const { entity, view, large, ignore_popup_card } = data;
-          this.showMoreInfo(entity, view, large, ignore_popup_card);
+          const { entity, view, large, ignore_popup_card, close } = data;
+          this.showMoreInfo(entity, view, large, ignore_popup_card, close);
           break;
 
         case "popup":