wait for hass in ha_elements

Author: maykar

src/build-header.js

@@ -174,8 +174,6 @@ export class CustomHeader {
       clickElement.dispatchEvent(new MouseEvent('click', { bubbles: false, cancelable: false }));
     };
     ['click', 'touchend'].forEach(evt => listenElement.addEventListener(evt, clickIt, false));
-    if (mobile) {
-      listenElement.addEventListener('tap', clickIt, false);
-    }
+    if (mobile) listenElement.addEventListener('tap', clickIt, false);
   }
 }

src/custom-header.ts

@@ -44,8 +44,6 @@ console.info(
   `${header} ${info} padding-bottom:6px; border-width: 0px 1px 1px 1px;`,
 );
 
-let haElem = ha_elements();
-
 const hideHeader = haElem => {
   if (!haElem || !haElem.appHeader) return;
   haElem.appHeader.style.display = 'none';
@@ -54,7 +52,7 @@ const hideHeader = haElem => {
 if (!window.location.href.includes('disable_ch')) hideHeader(ha_elements());
 
 export const rebuild = () => {
-  haElem = ha_elements();
+  const haElem = ha_elements();
   if (
     document
       .querySelector('home-assistant')!
@@ -169,7 +167,7 @@ export const rebuild = () => {
 };
 
 const rawConfigObserver = () => {
-  haElem = ha_elements();
+  const haElem = ha_elements();
   if (window['customHeaderRebuildMO']) window['customHeaderRebuildMO'].disconnect();
   if (window['customHeaderRawConfigExit']) window['customHeaderRawConfigExit'].disconnect();
   if (!haElem || !haElem.partialPanel) {

src/ha-elements.js

@@ -10,17 +10,16 @@ export const hass = getHass();
 
 export const ha_elements = () => {
   const haElem = {};
+  haElem.hass = getHass();
   haElem.lovelace = getLovelace();
   haElem.homeAssistant = document.querySelector('home-assistant');
   haElem.main = haElem.homeAssistant.shadowRoot.querySelector('home-assistant-main').shadowRoot;
-  haElem.hass = getHass();
   haElem.partialPanel = haElem.main.querySelector('partial-panel-resolver');
   haElem.panel = haElem.main.querySelector('ha-panel-lovelace');
   if (!haElem.panel) return;
   haElem.root = haElem.panel.shadowRoot.querySelector('hui-root');
   if (!haElem.root) return;
   haElem.root = haElem.root.shadowRoot;
-
   haElem.tabs = Array.from((haElem.root.querySelector('paper-tabs') || haElem.root).querySelectorAll('paper-tab'));
   haElem.tabContainer = haElem.root.querySelector('paper-tabs');
   haElem.menu = haElem.root.querySelector('ha-menu-button');
@@ -38,5 +37,4 @@ export const ha_elements = () => {
   haElem.sidebar.divider = haElem.sidebar.main.querySelector('div.divider');
   haElem.appHeader = haElem.root.querySelector('app-header');
   haElem.appLayout = haElem.root.querySelector('ha-app-layout');
-  return haElem;
 };