Merge pull request #28 from custom-cards/dev

Version 0.0.7
ofekashery · Oct 17, 2018 · c547223 · c547223
2 parents 95dfbd3 + 7c88a11
commit c547223
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ mv vertical-stack-in-card.js /config/www/
 
 ```yaml
 resources:
-  - url: /local/vertical-stack-in-card.js?v=0.0.2
+  - url: /local/vertical-stack-in-card.js?v=0.0.7
     type: js
 ```
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.0.6
+0.0.7
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,6 @@
+## 0.0.7
+- Fixes [#26](https://github.com/custom-cards/vertical-stack-in-card/issues/26)
+
 ## 0.0.6
 - Closing issue [#16](https://github.com/custom-cards/vertical-stack-in-card/issues/16)
 

diff --git a/vertical-stack-in-card.js b/vertical-stack-in-card.js
@@ -4,6 +4,7 @@ class VerticalStackInCard extends HTMLElement {
         // Make use of shadowRoot to avoid conflicts when reusing
         this.attachShadow({ mode: 'open' });
     }
+
     setConfig(config) {
         if (!config || !config.cards || !Array.isArray(config.cards)) {
             throw new Error('Card config incorrect');
@@ -26,6 +27,7 @@ class VerticalStackInCard extends HTMLElement {
             title.innerHTML = '<div class="name">' + config.title + '</div>';
             root.appendChild(title);
         }
+
         let element;
         config.cards.forEach(item => {
             if (item.type.startsWith("custom:")){
@@ -49,20 +51,29 @@ class VerticalStackInCard extends HTMLElement {
 
     connectedCallback() {
         this._refCards.forEach((element) => {
-            if (element.shadowRoot) {
-                if (!element.shadowRoot.querySelector('ha-card')) {
-                    let searchEles = element.shadowRoot.getElementById("root");
-                    if (!searchEles) {
-                        searchEles = element.shadowRoot.getElementById("card");
-                    }
-                    searchEles = searchEles.childNodes;
-                    for(let i = 0; i < searchEles.length; i++) {
-                        searchEles[i].style.margin = "0px";
-                        searchEles[i].shadowRoot.querySelector('ha-card').style.boxShadow = 'none';
+            let fn = () => {
+                if (element.shadowRoot) {
+                    if (!element.shadowRoot.querySelector('ha-card')) {
+                        let searchEles = element.shadowRoot.getElementById("root");
+                        if (!searchEles) {
+                            searchEles = element.shadowRoot.getElementById("card");
+                        }
+                        if(!searchEles) return;
+                        searchEles = searchEles.childNodes;
+                        for(let i = 0; i < searchEles.length; i++) {
+                            searchEles[i].style.margin = "0px";
+                            searchEles[i].shadowRoot.querySelector('ha-card').style.boxShadow = 'none';
+                        }
+                    } else {
+                        element.shadowRoot.querySelector('ha-card').style.boxShadow = 'none';
                     }
-                } else {
-                    element.shadowRoot.querySelector('ha-card').style.boxShadow = 'none';
                 }
+            };
+
+            if(element.updateComplete) {
+                element.updateComplete.then(fn);
+            } else {
+                fn();
             }
         });
     }