Better compatibility with ancient ios devices

thomasloven · Jan 27, 2022 · 41f3f05 · 41f3f05
1 parent 537bb11
commit 41f3f05
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 20 deletions.
diff --git a/fold-entity-row.js b/fold-entity-row.js
@@ -325,10 +325,15 @@ class FoldEntityRow extends s {
             }, 100);
         }
         const el = this.shadowRoot.querySelector("#measure");
-        this.observer = new ResizeObserver(() => {
-            this.maxheight = el.scrollHeight;
-        });
-        this.observer.observe(el);
+        try {
+            this.observer = new ResizeObserver(() => {
+                this.maxheight = el.scrollHeight;
+            });
+            this.observer.observe(el);
+        }
+        catch (_e) {
+            this.maxheight = 1e6;
+        }
     }
     connectedCallback() {
         super.connectedCallback();
@@ -459,32 +464,36 @@ class FoldEntityRow extends s {
       #items {
         padding: 0;
         margin: 0;
-        overflow: hidden;
         transition: max-height 0.2s ease-in-out;
         height: 100%;
-        overflow: clip visible;
+        overflow-x: clip;
+        overflow-y: visible;
       }
 
       #items.clip {
         overflow: clip;
       }
 
       #measure {
-        overflow: clip visible;
+        overflow-x: clip;
+        overflow-y: visible;
       }
       #measure > * {
         margin: 8px 0;
-        overflow: clip visible;
+        overflow-x: clip;
+        overflow-y: visible;
       }
       #measure > *:last-child {
         margin-bottom: 0;
       }
 
       #measure > div * {
-        overflow: clip visible;
+        overflow-x: clip;
+        overflow-y: visible;
       }
       #head > *:first-child {
-        overflow: clip visible;
+        overflow-x: clip;
+        overflow-y: visible;
       }
     `;
     }

diff --git a/src/main.ts b/src/main.ts
@@ -231,10 +231,14 @@ class FoldEntityRow extends LitElement {
     }
 
     const el = this.shadowRoot.querySelector("#measure") as HTMLElement;
-    this.observer = new ResizeObserver(() => {
-      this.maxheight = el.scrollHeight;
-    });
-    this.observer.observe(el);
+    try {
+      this.observer = new ResizeObserver(() => {
+        this.maxheight = el.scrollHeight;
+      });
+      this.observer.observe(el);
+    } catch (_e) {
+      this.maxheight = 1e6;
+    }
   }
 
   connectedCallback(): void {
@@ -374,32 +378,36 @@ class FoldEntityRow extends LitElement {
       #items {
         padding: 0;
         margin: 0;
-        overflow: hidden;
         transition: max-height 0.2s ease-in-out;
         height: 100%;
-        overflow: clip visible;
+        overflow-x: clip;
+        overflow-y: visible;
       }
 
       #items.clip {
         overflow: clip;
       }
 
       #measure {
-        overflow: clip visible;
+        overflow-x: clip;
+        overflow-y: visible;
       }
       #measure > * {
         margin: 8px 0;
-        overflow: clip visible;
+        overflow-x: clip;
+        overflow-y: visible;
       }
       #measure > *:last-child {
         margin-bottom: 0;
       }
 
       #measure > div * {
-        overflow: clip visible;
+        overflow-x: clip;
+        overflow-y: visible;
       }
       #head > *:first-child {
-        overflow: clip visible;
+        overflow-x: clip;
+        overflow-y: visible;
       }
     `;
   }

diff --git a/test/views/2_cooperation.yaml b/test/views/2_cooperation.yaml
@@ -91,6 +91,19 @@ cards:
               type: custom:fold-entity-row
               head: { entity: light.bed_light }
               open: true
+      - type: entities
+        entities:
+          - type: custom:hui-entity-filter-card
+            entities:
+              - light.bed_light
+              - light.ceiling_lights
+              - light.kitchen_lights
+            state_filter:
+              - "on"
+            card:
+              type: custom:fold-entity-row
+              head: { type: section, label: Section }
+              open: true
 
   - type: vertical-stack
     cards: