Split tokens into data and state to avoid data duplication

src/components/map/Map.js

@@ -21,8 +21,9 @@ const maxZoom = 5;
 function Map({
   map,
   mapState,
-  onMapTokenChange,
-  onMapTokenRemove,
+  tokens,
+  onMapTokenStateChange,
+  onMapTokenStateRemove,
   onMapChange,
   onMapStateChange,
   onMapDraw,
@@ -31,13 +32,13 @@ function Map({
 }) {
   const mapSource = useDataSource(map, defaultMapSources);
 
-  function handleProxyDragEnd(isOnMap, token) {
-    if (isOnMap && onMapTokenChange) {
-      onMapTokenChange(token);
+  function handleProxyDragEnd(isOnMap, tokenState) {
+    if (isOnMap && onMapTokenStateChange) {
+      onMapTokenStateChange(tokenState);
     }
 
-    if (!isOnMap && onMapTokenRemove) {
-      onMapTokenRemove(token);
+    if (!isOnMap && onMapTokenStateRemove) {
+      onMapTokenStateRemove(tokenState);
     }
   }
 
@@ -240,10 +241,11 @@ function Map({
       }}
     >
       {mapState &&
-        Object.values(mapState.tokens).map((token) => (
+        Object.values(mapState.tokens).map((tokenState) => (
           <MapToken
-            key={token.id}
-            token={token}
+            key={tokenState.id}
+            token={tokens.find((token) => token.id === tokenState.tokenId)}
+            tokenState={tokenState}
             tokenSizePercent={tokenSizePercent}
             className={`${mapTokenProxyClassName} ${mapTokenMenuClassName}`}
           />
@@ -335,7 +337,7 @@ function Map({
       />
       <TokenMenu
         tokenClassName={mapTokenMenuClassName}
-        onTokenChange={onMapTokenChange}
+        onTokenChange={onMapTokenStateChange}
         tokens={mapState && mapState.tokens}
       />
     </>

src/components/map/MapToken.js

@@ -9,7 +9,7 @@ import useDataSource from "../../helpers/useDataSource";
 
 import { tokenSources } from "../../tokens";
 
-function MapToken({ token, tokenSizePercent, className }) {
+function MapToken({ token, tokenState, tokenSizePercent, className }) {
   const imageSource = useDataSource(token, tokenSources);
 
   const imageRef = useRef();
@@ -19,7 +19,7 @@ function MapToken({ token, tokenSizePercent, className }) {
   return (
     <Box
       style={{
-        transform: `translate(${token.x * 100}%, ${token.y * 100}%)`,
+        transform: `translate(${tokenState.x * 100}%, ${tokenState.y * 100}%)`,
         width: "100%",
         height: "100%",
       }}
@@ -30,7 +30,7 @@ function MapToken({ token, tokenSizePercent, className }) {
     >
       <Box
         style={{
-          width: `${tokenSizePercent * (token.size || 1)}%`,
+          width: `${tokenSizePercent * (tokenState.size || 1)}%`,
         }}
         sx={{
           position: "absolute",
@@ -54,11 +54,13 @@ function MapToken({ token, tokenSizePercent, className }) {
             }}
             src={imageSource}
             // pass id into the dom element which is then used by the ProxyToken
-            data-id={token.id}
+            data-id={tokenState.id}
             ref={imageRef}
           />
-          {token.statuses && <TokenStatus statuses={token.statuses} />}
-          {token.label && <TokenLabel label={token.label} />}
+          {tokenState.statuses && (
+            <TokenStatus statuses={tokenState.statuses} />
+          )}
+          {tokenState.label && <TokenLabel label={tokenState.label} />}
         </Box>
       </Box>
     </Box>