Merge branch 'release/3.0.5'

CHANGELOG.md

@@ -1,3 +1,15 @@
+# 1.1.1
+## create-hakit
+- Adjustments to deploy script
+- Adjustments to base template
+
+# 3.0.5
+## @hakit/components
+- BUGFIX - Fixing bug for MediaPlayerCard where groups aren't available it was not rendering the cards
+
+## @hakit/core
+- CHANGE - useAreas now has a new returned value called `deviceEntities` which are related children for a matched device. You can merge entities and deviceEntities if you want to display them all.
+
 
 # 3.0.4
 ## @hakit/components

packages/components/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hakit/components",
   "type": "module",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "private": false,
   "keywords": [
     "react",
@@ -68,7 +68,7 @@
     "@emotion/react": ">=10.x",
     "@emotion/styled": ">=10.x",
     "@fullcalendar/react": "^6.1.9",
-    "@hakit/core": "^3.0.4",
+    "@hakit/core": "^3.0.5",
     "@use-gesture/react": ">=10.x",
     "autolinker": ">=4.x",
     "framer-motion": ">=10.x",

packages/components/src/Cards/AreaCard/AreaCard.stories.tsx

@@ -2,7 +2,6 @@ import type { Meta, StoryObj } from "@storybook/react";
 import { Title, Description, Primary, ArgTypes, Source } from "@storybook/blocks";
 import { ThemeProvider, AreaCard, Row, ButtonCard } from "@components";
 import type { AreaCardProps } from "@components";
-import { useHass } from "@hakit/core";
 // @ts-expect-error - Don't have types for jsx-to-string
 import jsxToString from "jsx-to-string";
 import { HassConnect } from "@hass-connect-fake";
@@ -70,7 +69,7 @@ function TemplateFull() {
   );
 }
 
-function UseHashExample() {
+const hashExample = `function UseHashExample() {
   const { useStore } = useHass();
   const setHash = useStore((store) => store.setHash);
   return (
@@ -86,7 +85,7 @@ function UseHashExample() {
       />
     </Row>
   );
-}
+}`;
 
 export default {
   title: "COMPONENTS/Cards/AreaCard",
@@ -104,12 +103,7 @@ export default {
             You can set the hash programmatically from anywhere and the area will activate! There's a helper hook designed to help with
             this!
           </p>
-          <Source
-            dark
-            code={jsxToString(UseHashExample(), {
-              useFunctionCode: true,
-            })}
-          />
+          <Source dark code={hashExample} />
           <h2>Component Props</h2>
           <ArgTypes />
         </>

packages/components/src/Shared/Entity/MediaPlayer/MediaPlayerControls/index.tsx

@@ -65,7 +65,13 @@ export interface MediaPlayerControlsProps extends ColumnProps {
   onStateChange?: (state: string) => void;
 }
 
-export const MediaPlayerControls = ({ groupedEntities, allEntityIds, onStateChange, entity, ...rest }: MediaPlayerControlsProps) => {
+export const MediaPlayerControls = ({
+  groupedEntities = [],
+  allEntityIds = [],
+  onStateChange,
+  entity,
+  ...rest
+}: MediaPlayerControlsProps) => {
   const primaryEntity = useEntity(entity);
   const supportsGrouping = supportsFeatureFromAttributes(primaryEntity.attributes, 524288);
   // To get proper ordering of speakers, we need to flatten the groupedEntities array while keeping the order of the groups

packages/core/package.json

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

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

@@ -21,6 +21,8 @@ export interface Area {
   services: DeviceRegistryEntry[];
   /** the entities linked to the area */
   entities: HassEntity[];
+  /** entities related to the matched devices */
+  deviceEntities: HassEntity[];
 }
 
 export function useAreas(): Area[] {
@@ -52,9 +54,10 @@ export function useAreas(): Area[] {
 
   return useMemo(() => {
     return areas.map((area) => {
-      const matchedEntities = [];
-      const matchedDevices = [];
-      const matchedServices = [];
+      const matchedEntities: HassEntity[] = [];
+      const matchedDevices: DeviceRegistryEntry[] = [];
+      const matchedServices: DeviceRegistryEntry[] = [];
+      const deviceEntities: HassEntity[] = [];
 
       for (const device of devices) {
         if (device.area_id === area.area_id) {
@@ -73,11 +76,11 @@ export function useAreas(): Area[] {
         // link the matchedDevices to an entity
         for (const device of matchedDevices) {
           if (entity.device_id === device.id) {
-            // first check if matchedEntities contains the entity already
-            const exists = matchedEntities.find((e) => e.entity_id === entity.entity_id);
+            // first check if deviceEntities contains the entity already
+            const exists = deviceEntities.find((e) => e.entity_id === entity.entity_id);
             if (!exists) {
               if (_entities[entity.entity_id]) {
-                matchedEntities.push(_entities[entity.entity_id]);
+                deviceEntities.push(_entities[entity.entity_id]);
               }
             }
           }
@@ -89,6 +92,7 @@ export function useAreas(): Area[] {
         devices: matchedDevices,
         services: matchedServices,
         entities: matchedEntities,
+        deviceEntities,
       };
     });
   }, [areas, devices, joinHassUrl, entities, _entities]);