Merge pull request #311 from shannonhochkins/development

Development

Author: shannonhochkins

CHANGELOG.md

@@ -1,3 +1,19 @@
+# 6.0.2
+
+### @hakit/components
+
+- BUGIX - spacing issue for ButtonCard when has no content - fixes [issue](https://github.com/shannonhochkins/ha-component-kit/issues/307)
+- FEATURE - Introducing "tooltipsWhenClosed" prop, which is now enabled by default to display an indicator of what a button does in collapsed state
+
+
+### @hakit/core
+
+- BUGFIX - HassConnect suspend/resume now resolves even when browsers skip `visibilitychange` after long tab freezes (added `pageshow` fallback + visibility polling), preventing stuck reconnections with error code 3 - solves [issue](https://github.com/shannonhochkins/ha-component-kit/issues/304)
+
+### General
+
+- BUGFIX - rimraf added to ensure scripts work in different OS's
+
 # 6.0.1
 
 ### General

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@hakit/components",
   "type": "module",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "private": false,
   "keywords": [
     "react",
@@ -70,7 +70,7 @@
     "@emotion/react": ">=11.x.x",
     "@emotion/styled": ">=11.x",
     "@fullcalendar/react": ">=6.x.x",
-    "@hakit/core": "^6.0.1",
+    "@hakit/core": "^6.0.2",
     "@use-gesture/react": ">=10.x",
     "autolinker": ">=4.x",
     "fullcalendar": ">=6.x.x",

packages/components/package.json

@@ -322,8 +322,8 @@ function InternalButtonCard<E extends EntityName>({
             style={
               isDefaultLayout || children
                 ? {
-                  marginBottom: "20px",
-                }
+                    marginBottom: "20px",
+                  }
                 : undefined
             }
           >

packages/components/src/Cards/ButtonCard/index.tsx

@@ -1,6 +1,6 @@
 {
   "name": "@hakit/core",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "private": false,
   "type": "module",
   "keywords": [

packages/core/package.json

@@ -57,6 +57,11 @@ export function handleSuspendResume(connection: Connection, options: HandleSuspe
    * Prevents stacking multiple promises.
    */
   let isSuspended = false;
+  /**
+   * Fallback interval to detect when the page becomes visible again in cases where
+   * visibilitychange/focus/resume events are not delivered after a long tab freeze.
+   */
+  let visibilityPollId: number | null = null;
 
   if (connection.connected) {
     if (debug) console.log("[SR] Connection is already active → handleSuspendResume will manage suspension");
@@ -88,6 +93,7 @@ export function handleSuspendResume(connection: Connection, options: HandleSuspe
         if (debug) console.log("[SR] pendingResolve() called → lifting suspension");
         isSuspended = false;
         pendingResolve = null;
+        stopVisibilityPolling();
         resolve();
         onStatusChange?.("connected");
       };
@@ -107,6 +113,7 @@ export function handleSuspendResume(connection: Connection, options: HandleSuspe
             if (document.hidden) {
               if (debug) console.log("[SR] Hidden timeout elapsed → calling suspend()");
               suspend();
+              startVisibilityPolling();
             } else {
               // User returned before timeout. Resolve immediately.
               if (pendingResolve) {
@@ -119,7 +126,7 @@ export function handleSuspendResume(connection: Connection, options: HandleSuspe
         : null;
 
     // If the user focuses before DELAY_MS is up, resume immediately:
-    if (typeof window !== "undefined") window.addEventListener("focus", onVisibleOrResume, { once: true });
+    if (typeof window !== "undefined") window.addEventListener("focus", onVisibleOrResume);
   }
 
   // helper when page/tab becomes visible or “resume” fires after freeze
@@ -139,6 +146,7 @@ export function handleSuspendResume(connection: Connection, options: HandleSuspe
       // resets isSuspended and pendingResolve itself
       pendingResolve();
     }
+    stopVisibilityPolling();
   }
 
   // helpers for the event listeners to attach
@@ -157,6 +165,29 @@ export function handleSuspendResume(connection: Connection, options: HandleSuspe
     onVisibleOrResume();
   }
 
+  function pageShowHandler() {
+    if (debug) console.log("[SR] pageshow event fired");
+    onVisibleOrResume();
+  }
+
+  function startVisibilityPolling() {
+    if (visibilityPollId !== null) return;
+    if (typeof window === "undefined") return;
+    visibilityPollId = window.setInterval(() => {
+      if (!document.hidden) {
+        if (debug) console.log("[SR] visibility polling detected VISIBLE");
+        onVisibleOrResume();
+      }
+    }, 2_000);
+  }
+
+  function stopVisibilityPolling() {
+    if (visibilityPollId !== null && typeof window !== "undefined") {
+      clearInterval(visibilityPollId);
+      visibilityPollId = null;
+    }
+  }
+
   function suspend() {
     if (!connection.connected) {
       if (debug) console.log("[SR] Connection already suspended → skipping suspend()");
@@ -172,6 +203,7 @@ export function handleSuspendResume(connection: Connection, options: HandleSuspe
   document.addEventListener("visibilitychange", visibilityChangeHandler, false);
   document.addEventListener("freeze", suspend);
   document.addEventListener("resume", resumeHandler);
+  document.addEventListener("pageshow", pageShowHandler);
 
   if (debug) console.log("[SR] handleSuspendResume() initialized; debugging is ON");
 
@@ -182,13 +214,15 @@ export function handleSuspendResume(connection: Connection, options: HandleSuspe
     document.removeEventListener("visibilitychange", visibilityChangeHandler, false);
     document.removeEventListener("freeze", suspend);
     document.removeEventListener("resume", resumeHandler);
+    document.removeEventListener("pageshow", pageShowHandler);
     if (typeof window !== "undefined") window.removeEventListener("focus", onVisibleOrResume);
 
     if (hiddenTimeoutId !== null) {
       if (debug) console.log("[SR] cleanup: Clearing hiddenTimeoutId");
       clearTimeout(hiddenTimeoutId);
       hiddenTimeoutId = null;
     }
+    stopVisibilityPolling();
     // If there’s still a pendingResolve (Promise not resolved), resolve it now so reconnection can recover:
     if (pendingResolve) {
       if (debug) console.log("[SR] cleanup: Resolving pendingResolve() to let reconnection proceed");

packages/core/src/HassConnect/handleSuspendResume.ts

@@ -164,6 +164,7 @@ class HistoryStream {
         // only expire the rest of the history as it ages.
         const lastExpiredState = expiredStates[expiredStates.length - 1];
         lastExpiredState.lu = purgeBeforePythonTime;
+        delete lastExpiredState.lc;
         newHistory[entityId].unshift(lastExpiredState);
       }
     }
@@ -352,32 +353,27 @@ export const computeHistory = (
       currentState || isNumericFromDomain(domain) ? undefined : stateInfo.find((state) => state.a && isNumericFromAttributes(state.a));
 
     const isNumeric = isNumericEntity(domain, currentState, numericStateFromHistory, sensorNumericalDeviceClasses, forceNumeric);
-
     let unit: string | undefined;
-
     if (isNumeric) {
       unit = currentState?.attributes.unit_of_measurement || numericStateFromHistory?.a.unit_of_measurement || BLANK_UNIT;
     } else {
-      if (domain === "zone") {
-        unit = localize("people_in_zone");
-      } else if (domain === "climate" || domain === "water_heater") {
-        unit = config?.unit_system.temperature;
-      } else if (domain === "humidifier") {
-        unit = "%";
-      }
+      unit = {
+        zone: localize("unit"),
+        climate: config?.unit_system.temperature,
+        humidifier: "%",
+        water_heater: config?.unit_system.temperature,
+      }[domain as keyof typeof specialDomainClasses];
     }
 
-    let deviceClassSpecial: string | undefined;
-
-    if (domain === "climate") {
-      deviceClassSpecial = "temperature";
-    } else if (domain === "humidifier") {
-      deviceClassSpecial = "humidity";
-    } else if (domain === "water_heater") {
-      deviceClassSpecial = "temperature";
-    }
+    const specialDomainClasses = {
+      climate: "temperature",
+      humidifier: "humidity",
+      water_heater: "temperature",
+    };
 
-    const deviceClass: string | undefined = deviceClassSpecial || (currentState?.attributes || numericStateFromHistory?.a)?.device_class;
+    const deviceClass: string | undefined =
+      specialDomainClasses[domain as keyof typeof specialDomainClasses] ||
+      (currentState?.attributes || numericStateFromHistory?.a)?.device_class;
 
     const key = computeGroupKey(unit, deviceClass, splitDeviceClasses);