Add group support to SelectDataModal

src/modals/SelectDataModal.js

@@ -1,9 +1,10 @@
 import React, { useEffect, useState } from "react";
-import { Box, Label, Flex, Button, Text, Checkbox, Divider } from "theme-ui";
+import { Box, Label, Flex, Button, Text, Checkbox } from "theme-ui";
 import SimpleBar from "simplebar-react";
 
 import Modal from "../components/Modal";
 import LoadingOverlay from "../components/LoadingOverlay";
+import Divider from "../components/Divider";
 
 import { getDatabase } from "../database";
 
@@ -17,8 +18,10 @@ function SelectDataModal({
   filter,
 }) {
   const [maps, setMaps] = useState({});
+  const [mapGroups, setMapGroups] = useState([]);
   const [tokensByMap, setTokensByMap] = useState({});
   const [tokens, setTokens] = useState({});
+  const [tokenGroups, setTokenGroups] = useState([]);
 
   const [isLoading, setIsLoading] = useState(false);
   const hasMaps = Object.values(maps).length > 0;
@@ -36,7 +39,12 @@ function SelectDataModal({
           .table("maps")
           .filter((map) => filter("maps", map, map.id))
           .each((map) => {
-            loadedMaps[map.id] = { name: map.name, id: map.id, checked: true };
+            loadedMaps[map.id] = {
+              name: map.name,
+              id: map.id,
+              type: map.type,
+              checked: true,
+            };
           });
         await db
           .table("states")
@@ -56,17 +64,27 @@ function SelectDataModal({
             loadedTokens[token.id] = {
               name: token.name,
               id: token.id,
+              type: token.type,
               checked: true,
             };
           });
+
+        const mapGroup = await db.table("groups").get("maps");
+        const tokenGroup = await db.table("groups").get("tokens");
+
         db.close();
         setMaps(loadedMaps);
+        setMapGroups(mapGroup.items);
         setTokensByMap(loadedTokensByMap);
+        setTokenGroups(tokenGroup.items);
         setTokens(loadedTokens);
         setIsLoading(false);
       } else {
         setMaps({});
         setTokens({});
+        setTokenGroups([]);
+        setMapGroups([]);
+        setTokensByMap({});
       }
     }
     loadData();
@@ -92,7 +110,7 @@ function SelectDataModal({
     setTokens((prevTokens) => {
       let newTokens = { ...prevTokens };
       for (let id in newTokens) {
-        if (id in tokensUsed) {
+        if (id in tokensUsed && newTokens[id].type !== "default") {
           newTokens[id].checked = true;
         }
       }
@@ -106,11 +124,11 @@ function SelectDataModal({
     onConfirm(checkedMaps, checkedTokens);
   }
 
-  function handleSelectMapsChanged(event) {
+  function handleMapsChanged(event, maps) {
     setMaps((prevMaps) => {
       let newMaps = { ...prevMaps };
-      for (let id in newMaps) {
+      for (let map of maps) {
-        newMaps[id].checked = event.target.checked;
+        newMaps[map.id].checked = event.target.checked;
       }
       return newMaps;
     });
@@ -118,58 +136,144 @@ function SelectDataModal({
     if (!event.target.checked && !tokensSelectChecked) {
       setTokens((prevTokens) => {
         let newTokens = { ...prevTokens };
+        let tempUsedCount = { ...tokenUsedCount };
         for (let id in newTokens) {
-          newTokens[id].checked = false;
+          for (let map of maps) {
-        }
+            if (tokensByMap[map.id].has(id)) {
-        return newTokens;
+              if (tempUsedCount[id] > 1) {
-      });
+                tempUsedCount[id] -= 1;
-    }
+              } else if (tempUsedCount[id] === 1) {
-  }
+                tempUsedCount[id] = 0;
-
-  function handleMapChange(event, map) {
-    setMaps((prevMaps) => ({
-      ...prevMaps,
-      [map.id]: { ...map, checked: event.target.checked },
-    }));
-    // If all token select is unchecked then ensure tokens assosiated to this map are unchecked
-    if (!event.target.checked && !tokensSelectChecked) {
-      setTokens((prevTokens) => {
-        let newTokens = { ...prevTokens };
-        for (let id in newTokens) {
-          if (tokensByMap[map.id].has(id) && tokenUsedCount[id] === 1) {
                 newTokens[id].checked = false;
               }
             }
+          }
+        }
         return newTokens;
       });
     }
   }
 
-  function handleSelectTokensChange(event) {
+  function handleTokensChanged(event, tokens) {
     setTokens((prevTokens) => {
       let newTokens = { ...prevTokens };
-      for (let id in newTokens) {
+      for (let token of tokens) {
-        if (!(id in tokenUsedCount)) {
+        if (!(token.id in tokenUsedCount) || token.type === "default") {
-          newTokens[id].checked = event.target.checked;
+          newTokens[token.id].checked = event.target.checked;
         }
       }
       return newTokens;
     });
   }
 
-  function handleTokenChange(event, token) {
-    setTokens((prevTokens) => ({
-      ...prevTokens,
-      [token.id]: { ...token, checked: event.target.checked },
-    }));
-  }
-
   // Some tokens are checked not by maps or all tokens are checked by maps
   const tokensSelectChecked =
     Object.values(tokens).some(
       (token) => !(token.id in tokenUsedCount) && token.checked
     ) || Object.values(tokens).every((token) => token.id in tokenUsedCount);
 
+  function renderGroupContainer(group, checked, renderItem, onGroupChange) {
+    return (
+      <Flex
+        ml={4}
+        sx={{
+          flexWrap: "wrap",
+          borderRadius: "4px",
+          flexDirection: "column",
+          position: "relative",
+        }}
+        key={group.id}
+      >
+        <Label my={1} sx={{ fontFamily: "body2" }}>
+          <Checkbox
+            checked={checked}
+            onChange={(e) => onGroupChange(e, group)}
+          />
+          {group.name}
+        </Label>
+        <Flex
+          sx={{
+            flexWrap: "wrap",
+            flexDirection: "column",
+            position: "relative",
+          }}
+        >
+          {group.items.map(renderItem)}
+          <Box
+            sx={{ position: "absolute", left: "2px", top: 0, height: "100%" }}
+          >
+            <Divider vertical fill />
+          </Box>
+        </Flex>
+      </Flex>
+    );
+  }
+
+  function renderMapGroup(group) {
+    if (group.type === "item") {
+      const map = maps[group.id];
+      return (
+        <Label key={map.id} my={1} pl={4} sx={{ fontFamily: "body2" }}>
+          <Checkbox
+            checked={map.checked}
+            onChange={(e) => handleMapsChanged(e, [map])}
+          />
+          {map.name}
+        </Label>
+      );
+    } else {
+      return renderGroupContainer(
+        group,
+        group.items.some((item) => maps[item.id].checked),
+        renderMapGroup,
+        (e, group) =>
+          handleMapsChanged(
+            e,
+            group.items.map((group) => maps[group.id])
+          )
+      );
+    }
+  }
+
+  function renderTokenGroup(group) {
+    if (group.type === "item") {
+      const token = tokens[group.id];
+      return (
+        <Box pl={4} my={1} key={token.id}>
+          <Label sx={{ fontFamily: "body2" }}>
+            <Checkbox
+              checked={token.checked}
+              onChange={(e) => handleTokensChanged(e, [token])}
+              disabled={token.type !== "default" && token.id in tokenUsedCount}
+            />
+            {token.name}
+          </Label>
+          {token.id in tokenUsedCount && token.type !== "default" && (
+            <Text as="p" variant="caption" ml={4}>
+              Token used in {tokenUsedCount[token.id]} selected map
+              {tokenUsedCount[token.id] > 1 && "s"}
+            </Text>
+          )}
+        </Box>
+      );
+    } else {
+      const checked =
+        group.items.some(
+          (item) => !(item.id in tokenUsedCount) && tokens[item.id].checked
+        ) || group.items.every((item) => item.id in tokenUsedCount);
+      return renderGroupContainer(
+        group,
+        checked,
+        renderTokenGroup,
+        (e, group) =>
+          handleTokensChanged(
+            e,
+            group.items.map((group) => tokens[group.id])
+          )
+      );
+    }
+  }
+
   return (
     <Modal
       isOpen={isOpen}
@@ -206,55 +310,29 @@ function SelectDataModal({
                   <Label>
                     <Checkbox
                       checked={Object.values(maps).some((map) => map.checked)}
-                      onChange={handleSelectMapsChanged}
+                      onChange={(e) =>
+                        handleMapsChanged(e, Object.values(maps))
+                      }
                     />
                     Maps
                   </Label>
                 </Flex>
-                {Object.values(maps).map((map) => (
+                {mapGroups.map(renderMapGroup)}
-                  <Label
-                    key={map.id}
-                    my={1}
-                    pl={4}
-                    sx={{ fontFamily: "body2" }}
-                  >
-                    <Checkbox
-                      checked={map.checked}
-                      onChange={(e) => handleMapChange(e, map)}
-                    />
-                    {map.name}
-                  </Label>
-                ))}
               </>
             )}
-            {hasMaps && hasTokens && <Divider bg="text" />}
+            {hasMaps && hasTokens && <Divider fill />}
             {hasTokens && (
               <>
                 <Label>
                   <Checkbox
                     checked={tokensSelectChecked}
-                    onChange={handleSelectTokensChange}
+                    onChange={(e) =>
+                      handleTokensChanged(e, Object.values(tokens))
+                    }
                   />
                   Tokens
                 </Label>
-                {Object.values(tokens).map((token) => (
+                {tokenGroups.map(renderTokenGroup)}
-                  <Box pl={4} my={1} key={token.id}>
-                    <Label sx={{ fontFamily: "body2" }}>
-                      <Checkbox
-                        checked={token.checked}
-                        onChange={(e) => handleTokenChange(e, token)}
-                        disabled={token.id in tokenUsedCount}
-                      />
-                      {token.name}
-                    </Label>
-                    {token.id in tokenUsedCount && (
-                      <Text as="p" variant="caption" ml={4}>
-                        Token used in {tokenUsedCount[token.id]} selected map
-                        {tokenUsedCount[token.id] > 1 && "s"}
-                      </Text>
-                    )}
-                  </Box>
-                ))}
               </>
             )}
           </Flex>