Merge pull request #299 from shannonhochkins/development

Development

Author: shannonhochkins

CHANGELOG.md

@@ -1,3 +1,20 @@
+# 6.0.1
+
+### General
+CHORE - Locales refreshed to the latest Home Assistant strings/hashes; locale key types updated for new tokens (e.g., any/first/last, additional device status terms).
+
+### @hakit/core
+BUGFIX - HassConnect now guards all window access in suspend/resume and connection flows to avoid SSR/test crashes and ensure inherited connections/auth-callback cleanup stay safe (nextjs fix)
+IMPROVEMENT - Entity registry list derives domain titles via computeDomainTitle, improving labels/search without relying on locale strings.
+IMPROVEMENT - Service schema/types regenerated from the latest HA: frontend.setTheme supports optional light/dark names, scene services add apply/create/delete with transitions, media/recorder constraints refreshed.
+IMPROVEMENT - Humidifier entities expose target_humidity_step for finer control.
+
+### @hakit/components
+No component code changes; version bumped to align with core 6.0.1.
+
+### create-hakit
+Bump to 1.2.3 to consume the latest packages.
+
 # 6.0.0
 
 ## Migration Checklist

packages/components/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hakit/components",
   "type": "module",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "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.0",
+    "@hakit/core": "^6.0.1",
     "@use-gesture/react": ">=10.x",
     "autolinker": ">=4.x",
     "fullcalendar": ">=6.x.x",

packages/components/src/Shared/Modal/ModalByEntityDomain/index.tsx

@@ -94,6 +94,7 @@ export type ModalByEntityDomainProps<E extends EntityName> = ModalPropsHelper<Ex
   hideUpdated?: boolean;
   hideAttributes?: boolean;
   hideLogbook?: boolean;
+  hideDeviceSettings?: boolean;
   stateTitle?: ReactNode;
   /** There's currently a few default header actions, this will allow you to place your own actions in a different order @default 'start' */
   headerActionsPosition?: "start" | "middle" | "end";
@@ -124,6 +125,7 @@ export function ModalByEntityDomain<E extends EntityName>({
   hideState,
   hideUpdated,
   hideAttributes,
+  hideDeviceSettings,
   headerActionsPosition = "start",
   headerActions,
   hideLogbook = false,
@@ -159,17 +161,20 @@ export function ModalByEntityDomain<E extends EntityName>({
       childProps,
     ];
   }, [rest]);
+
   const domain = computeDomain(entity);
 
   const onStateChange = useCallback((value: string) => {
     if (!stateRef.current) return;
     stateRef.current.innerText = value;
   }, []);
+
   const LazyModalComponent = useMemo(() => {
     const modal = getLazyModal(domain as keyof ModalPropsByDomain);
     if (!modal) return null;
     return lazy(modal);
   }, [domain]);
+
   const defaultChildren = useMemo(() => {
     if (!LazyModalComponent || hideDefaultLayout) return null;
     const fallback = (
@@ -207,45 +212,55 @@ export function ModalByEntityDomain<E extends EntityName>({
   const titleValue = useMemo(() => {
     return modalProps.stateTitle ?? startCase(lowerCase(`${_entity.state}${_entity.attributes.unit_of_measurement ?? ""}`));
   }, [_entity, modalProps.stateTitle]);
+
   return (
     <Modal
       {...modalProps}
-      headerActions={() => {
-        return (
-          <>
-            {!hideLogbook && showLogbook && (
-              <FabCard
-                title={localize("device")}
-                tooltipPlacement="left"
-                icon="mdi:arrow-back"
-                size={30}
-                onClick={() => setShowLogbook(false)}
-              />
-            )}
-            {headerActionsPosition === "start" && headerActions && headerActions()}
-            {!hideLogbook && !showLogbook && (
-              <FabCard
-                title={localize("activity")}
-                tooltipPlacement="left"
-                icon="mdi:graph-box"
-                size={30}
-                onClick={() => setShowLogbook(true)}
-              />
-            )}
-            {headerActionsPosition === "middle" && headerActions && headerActions()}
-            {device && device.device_id && (
-              <FabCard title={localize("open_device_settings")} tooltipPlacement="left" icon="mdi:cog" size={30} onClick={openDevice} />
-            )}
-            {headerActionsPosition === "end" && headerActions && headerActions()}
-            {(!hideLogbook || (device && device.device_id)) && <Separator />}
-          </>
-        );
-      }}
-    >
-      {showLogbook ? (
+      headerActions={() => (
         <>
-          <LogBookRenderer entity={entity} />
+          {/* Logbook Back Button */}
+          {!hideLogbook && showLogbook && (
+            <FabCard
+              title={localize("device")}
+              tooltipPlacement="left"
+              icon="mdi:arrow-back"
+              size={30}
+              onClick={() => setShowLogbook(false)}
+            />
+          )}
+
+          {/* Header actions at the start */}
+          {headerActionsPosition === "start" && headerActions && headerActions()}
+
+          {/* Logbook Open Button */}
+          {!hideLogbook && !showLogbook && (
+            <FabCard
+              title={localize("activity")}
+              tooltipPlacement="left"
+              icon="mdi:graph-box"
+              size={30}
+              onClick={() => setShowLogbook(true)}
+            />
+          )}
+
+          {/* Header actions in the middle */}
+          {headerActionsPosition === "middle" && headerActions && headerActions()}
+
+          {/* Device Settings (Cog) */}
+          {device && device.device_id && !hideDeviceSettings && (
+            <FabCard title={localize("open_device_settings")} tooltipPlacement="left" icon="mdi:cog" size={30} onClick={openDevice} />
+          )}
+
+          {/* Header actions at the end */}
+          {headerActionsPosition === "end" && headerActions && headerActions()}
+
+          {/* Separator if either logbook or settings exists */}
+          {(!hideLogbook || (device && device.device_id && !hideDeviceSettings)) && <Separator />}
         </>
+      )}
+    >
+      {showLogbook ? (
+        <LogBookRenderer entity={entity} />
       ) : (
         <>
           {(!hideUpdated || !hideState) && (

packages/core/package.json

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

packages/core/src/HassConnect/Provider.tsx

@@ -255,9 +255,9 @@ export function HassProvider({
   }, [_hash]);
 
   useEffect(() => {
-    window.addEventListener("hashchange", onHashChange);
+    if (typeof window !== "undefined") window.addEventListener("hashchange", onHashChange);
     return () => {
-      window.removeEventListener("hashchange", onHashChange);
+      if (typeof window !== "undefined") window.removeEventListener("hashchange", onHashChange);
     };
   }, []);
 

packages/core/src/HassConnect/handleSuspendResume.ts

@@ -99,24 +99,27 @@ export function handleSuspendResume(connection: Connection, options: HandleSuspe
 
     // Wait DELAY_MS before actually closing the socket.
     if (debug) console.log(`[SR] Starting hidden delay of ${DELAY_MS}ms before actual suspend()`);
-    hiddenTimeoutId = window.setTimeout(() => {
-      hiddenTimeoutId = null;
-      // If still hidden, suspend the connection:
-      if (document.hidden) {
-        if (debug) console.log("[SR] Hidden timeout elapsed → calling suspend()");
-        suspend();
-      } else {
-        // User returned before timeout. Resolve immediately.
-        if (pendingResolve) {
-          if (debug) console.log("[SR] Hidden timeout elapsed but page is visible → resolving pendingResolve()");
-          // potentially unreachable, but just in case!
-          pendingResolve();
-        }
-      }
-    }, DELAY_MS);
+    hiddenTimeoutId =
+      typeof window !== "undefined"
+        ? window.setTimeout(() => {
+            hiddenTimeoutId = null;
+            // If still hidden, suspend the connection:
+            if (document.hidden) {
+              if (debug) console.log("[SR] Hidden timeout elapsed → calling suspend()");
+              suspend();
+            } else {
+              // User returned before timeout. Resolve immediately.
+              if (pendingResolve) {
+                if (debug) console.log("[SR] Hidden timeout elapsed but page is visible → resolving pendingResolve()");
+                // potentially unreachable, but just in case!
+                pendingResolve();
+              }
+            }
+          }, DELAY_MS)
+        : null;
 
     // If the user focuses before DELAY_MS is up, resume immediately:
-    window.addEventListener("focus", onVisibleOrResume, { once: true });
+    if (typeof window !== "undefined") window.addEventListener("focus", onVisibleOrResume, { once: true });
   }
 
   // helper when page/tab becomes visible or “resume” fires after freeze
@@ -161,7 +164,7 @@ export function handleSuspendResume(connection: Connection, options: HandleSuspe
     }
     onStatusChange?.("suspended");
     if (debug) console.log("[SR] suspend() called → suspending connection");
-    window.stop();
+    if (typeof window !== "undefined") window.stop();
     connection.suspend();
   }
 
@@ -179,7 +182,7 @@ export function handleSuspendResume(connection: Connection, options: HandleSuspe
     document.removeEventListener("visibilitychange", visibilityChangeHandler, false);
     document.removeEventListener("freeze", suspend);
     document.removeEventListener("resume", resumeHandler);
-    window.removeEventListener("focus", onVisibleOrResume);
+    if (typeof window !== "undefined") window.removeEventListener("focus", onVisibleOrResume);
 
     if (hiddenTimeoutId !== null) {
       if (debug) console.log("[SR] cleanup: Clearing hiddenTimeoutId");

packages/core/src/HassConnect/tryConnection.ts

@@ -61,7 +61,7 @@ type ConnectionType = "auth-callback" | "user-request" | "saved-tokens" | "inher
 
 function getInheritedConnection(): typeof window.hassConnection | undefined {
   try {
-    return window.top?.hassConnection;
+    return typeof window !== "undefined" ? window.top?.hassConnection : undefined;
   } catch (e) {
     console.error("Error getting inherited connection", e);
     return undefined;
@@ -185,7 +185,7 @@ export const tryConnection = async (hassUrl: string, hassToken?: string): Promis
     };
   } finally {
     // Clear url if we have a auth callback in url.
-    if (location && location.search.includes("auth_callback=1")) {
+    if (typeof window !== "undefined" && location && location.search.includes("auth_callback=1")) {
       history.replaceState(null, "", location.pathname);
     }
   }

packages/core/src/hooks/useEntity/index.ts

@@ -77,7 +77,7 @@ export function useEntity<E extends EntityName, O extends UseEntityOptions = Use
       // if returnNullIfNotFound is true, we return null, if not we throw an error
       return null as unknown as UseEntityReturnType<E, O>;
     }
-    return { ...formatted, service, history } as UseEntityReturnType<E, O>;
+    return { ...formatted, service, history } as unknown as UseEntityReturnType<E, O>;
   }, [formatted, service, history]);
 
   return entityWithHelpers;