From 549ecbf65ae0f6822496d4b0b82647cb8d6f6c63 Mon Sep 17 00:00:00 2001
From: Mitchell McCaffrey <mitchemmc@gmail.com>
Date: Fri, 21 May 2021 16:14:11 +1000
Subject: [PATCH] Fix rendering of sub groups in group tiles

---
 src/components/map/MapTiles.js     | 11 +++++++----
 src/components/token/TokenTiles.js |  9 +++++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/components/map/MapTiles.js b/src/components/map/MapTiles.js
index fda1097..dcc6d94 100644
--- a/src/components/map/MapTiles.js
+++ b/src/components/map/MapTiles.js
@@ -14,7 +14,11 @@ import SortableTiles from "../drag/SortableTiles";
 
 import useResponsiveLayout from "../../hooks/useResponsiveLayout";
 
-import { groupsFromIds, itemsFromGroups } from "../../helpers/select";
+import {
+  groupsFromIds,
+  itemsFromGroups,
+  getGroupItems,
+} from "../../helpers/select";
 
 function MapTiles({
   maps,
@@ -90,13 +94,12 @@ function MapTiles({
       );
     } else {
       const isSelected = selectedGroupIds.includes(group.id);
+      const items = getGroupItems(group);
       return (
         <MapTileGroup
           key={group.id}
           group={group}
-          maps={group.items.map((item) =>
-            maps.find((map) => map.id === item.id)
-          )}
+          maps={items.map((item) => maps.find((map) => map.id === item.id))}
           isSelected={isSelected}
           onSelect={onTileSelect}
         />
diff --git a/src/components/token/TokenTiles.js b/src/components/token/TokenTiles.js
index 00f99d5..ebc703d 100644
--- a/src/components/token/TokenTiles.js
+++ b/src/components/token/TokenTiles.js
@@ -15,7 +15,11 @@ import SortableTiles from "../drag/SortableTiles";
 
 import useResponsiveLayout from "../../hooks/useResponsiveLayout";
 
-import { groupsFromIds, itemsFromGroups } from "../../helpers/select";
+import {
+  groupsFromIds,
+  itemsFromGroups,
+  getGroupItems,
+} from "../../helpers/select";
 
 function TokenTiles({
   tokens,
@@ -70,11 +74,12 @@ function TokenTiles({
       );
     } else {
       const isSelected = selectedGroupIds.includes(group.id);
+      const items = getGroupItems(group);
       return (
         <TokenTileGroup
           key={group.id}
           group={group}
-          tokens={group.items.map((item) =>
+          tokens={items.map((item) =>
             tokens.find((token) => token.id === item.id)
           )}
           isSelected={isSelected}