another useTemplate bug

Author: shannonhochkins

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 5.1.4
+- useTemplate was too restrictive and only setting the state when the value was a string, will now return string/object
+
 # 5.1.3
 - Release failed, bumping again, add a console error for template rendering errors.
 

packages/components/package.json

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

packages/core/package.json

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

packages/core/src/HassConnect/examples/renderError.code.tsx

@@ -2,15 +2,18 @@ import { HassConnect, useStore } from "@hakit/core";
 import { ThemeProvider } from "@hakit/components";
 export function App() {
   return (
-    <HassConnect hassUrl="http://homeassistant.local:8123" options={{
-      renderError: (error) => (
-        <div style={{ color: 'red', padding: '1rem', backgroundColor: '#fdd' }}>
-          <h2>Error</h2>
-          {error}
-          <p>Please check your connection or authentication details.</p>
-        </div>
-      ),
-    }}>
+    <HassConnect
+      hassUrl="http://homeassistant.local:8123"
+      options={{
+        renderError: (error) => (
+          <div style={{ color: "red", padding: "1rem", backgroundColor: "#fdd" }}>
+            <h2>Error</h2>
+            {error}
+            <p>Please check your connection or authentication details.</p>
+          </div>
+        ),
+      }}
+    >
       <ThemeProvider />
       <SomeComponent />
     </HassConnect>

packages/core/src/HassConnect/examples/specifyingLanguage.code.tsx

@@ -2,9 +2,12 @@ import { HassConnect, useStore } from "@hakit/core";
 import { ThemeProvider } from "@hakit/components";
 export function App() {
   return (
-    <HassConnect hassUrl="http://homeassistant.local:8123" options={{
-      locale: 'en', // Specify the desired locale
-    }}>
+    <HassConnect
+      hassUrl="http://homeassistant.local:8123"
+      options={{
+        locale: "en", // Specify the desired locale
+      }}
+    >
       <ThemeProvider />
       <SomeComponent />
     </HassConnect>

packages/core/src/hooks/useTemplate/examples/disable.code.tsx

@@ -3,18 +3,19 @@ import { templateCodeToProcess } from "./constants";
 import { useState } from "react";
 
 function RenderCustomTemplate() {
-
   const [enabled, setEnabled] = useState(false);
   const template = useTemplate({
     enabled,
     template: templateCodeToProcess,
     variables: { entity_id: "light.fake_light_1" },
   });
 
-  return <>
-    Template result: {template ?? "not-enabled"}
-    <button onClick={() => setEnabled(!enabled)}>{enabled ? "Disable" : "Enable"}</button>
-  </>;
+  return (
+    <>
+      Template result: {template ?? "not-enabled"}
+      <button onClick={() => setEnabled(!enabled)}>{enabled ? "Disable" : "Enable"}</button>
+    </>
+  );
 }
 
 export function App() {

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

@@ -34,7 +34,7 @@ export type TemplateParams = {
 
 export const useTemplate = (params: TemplateParams) => {
   const connection = useStore((state) => state.connection);
-  const [template, setTemplate] = useState<string | null>(null);
+  const [template, setTemplate] = useState<string | object | null>(null);
   const unsubscribeRef = useRef<UnsubscribeFunc | null>(null);
   const memoizedParams = useMemo(() => params, [params]);
 
@@ -67,9 +67,7 @@ export const useTemplate = (params: TemplateParams) => {
         setTemplate(response.error);
         return;
       }
-      if (typeof response.result === "string") {
-        setTemplate((previous) => (previous === response.result ? previous : response.result));
-      }
+      setTemplate((previous) => (previous === response.result ? previous : response.result));
     };
 
     const handleError = (err: RenderTemplateError) => {