Fix linkedItem perf and bug

jrmi · Mar 8, 2024 · 041ed39 · 041ed39 · github-actions · Mar 8, 2024
1 parent 579ce91
commit 041ed39
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 24 deletions.
diff --git a/src/gameComponents/AdvancedImage/AdvancedImage.jsx b/src/gameComponents/AdvancedImage/AdvancedImage.jsx
@@ -144,21 +144,21 @@ const AdvancedImage = ({
             linkedItems: newLinkedItems,
           };
         }
-
-        return {};
       }, true);
     },
     [currentItemId, getItemList, setState]
   );
 
   React.useEffect(() => {
     const unregisterList = [];
-    unregisterList.push(register(onPlaceItem));
+    if (currentItemId) {
+      unregisterList.push(register(onPlaceItem));
+    }
 
     return () => {
       unregisterList.forEach((callback) => callback());
     };
-  }, [onPlaceItem, register]);
+  }, [currentItemId, onPlaceItem, register]);
 
   return (
     <Wrapper ref={wrapperRef}>

diff --git a/src/gameComponents/CheckerBoard/CheckerBoard.jsx b/src/gameComponents/CheckerBoard/CheckerBoard.jsx
@@ -52,21 +52,21 @@ const CheckerBoard = ({
             linkedItems: newLinkedItems,
           };
         }
-
-        return {};
       }, true);
     },
     [currentItemId, getItemList, setState]
   );
 
   React.useEffect(() => {
     const unregisterList = [];
-    unregisterList.push(register(onPlaceItem));
+    if (currentItemId) {
+      unregisterList.push(register(onPlaceItem));
+    }
 
     return () => {
       unregisterList.forEach((callback) => callback());
     };
-  }, [onPlaceItem, register]);
+  }, [currentItemId, onPlaceItem, register]);
 
   return (
     <StyledCheckerBoard

diff --git a/src/gameComponents/DieImage/DieImage.jsx b/src/gameComponents/DieImage/DieImage.jsx
@@ -18,13 +18,12 @@ const Dice = ({
 
   React.useEffect(() => {
     const unregisterList = [];
-    if (rollOnMove) {
+    if (id && rollOnMove) {
       const rollOnPlace = (itemIds) => {
         if (itemIds.includes(id)) {
           roll([id]);
         }
       };
-
       unregisterList.push(register(rollOnPlace));
     }
     return () => {

diff --git a/src/gameComponents/Generator/Generator.jsx b/src/gameComponents/Generator/Generator.jsx
@@ -246,13 +246,15 @@ const Generator = ({ color = "#ccc", item, id, currentItemId, setState }) => {
      * Register events callback
      */
     const unregisterList = [];
-    unregisterList.push(registerPlace(onPlaceItem));
-    unregisterList.push(registerDelete(onDeleteItem));
+    if (currentItemId) {
+      unregisterList.push(registerPlace(onPlaceItem));
+      unregisterList.push(registerDelete(onDeleteItem));
+    }
 
     return () => {
       unregisterList.forEach((callback) => callback());
     };
-  }, [registerPlace, registerDelete, onPlaceItem, onDeleteItem]);
+  }, [registerPlace, registerDelete, onPlaceItem, onDeleteItem, currentItemId]);
 
   React.useEffect(() => {
     /**

diff --git a/src/gameComponents/Image/Image.jsx b/src/gameComponents/Image/Image.jsx
@@ -137,21 +137,21 @@ const Image = ({
             linkedItems: newLinkedItems,
           };
         }
-
-        return {};
       }, true);
     },
     [currentItemId, getItemList, setState]
   );
 
   React.useEffect(() => {
     const unregisterList = [];
-    unregisterList.push(register(onPlaceItem));
+    if (currentItemId) {
+      unregisterList.push(register(onPlaceItem));
+    }
 
     return () => {
       unregisterList.forEach((callback) => callback());
     };
-  }, [onPlaceItem, register]);
+  }, [currentItemId, onPlaceItem, register]);
 
   return (
     <Wrapper ref={wrapperRef}>

diff --git a/src/gameComponents/Zone/Zone.jsx b/src/gameComponents/Zone/Zone.jsx
@@ -77,8 +77,6 @@ const Zone = ({
             linkedItems: newLinkedItems,
           };
         }
-
-        return {};
       }, true);
 
       const addedItems = Object.entries(
@@ -106,18 +104,24 @@ const Zone = ({
 
   React.useEffect(() => {
     if (!holdItems && setState) {
-      setState((item) => ({ ...item, linkedItems: [] }));
+      setState((item) => {
+        if (!Array.isArray(item.linkedItems) || item.linkedItems.length > 0) {
+          return { linkedItems: [] };
+        }
+      }, true);
     }
   }, [holdItems, setState]);
 
   React.useEffect(() => {
     const unregisterList = [];
-    unregisterList.push(register(onInsideItem));
+    if (currentItemId) {
+      unregisterList.push(register(onInsideItem));
+    }
 
     return () => {
       unregisterList.forEach((callback) => callback());
     };
-  }, [onInsideItem, onItem, register]);
+  }, [currentItemId, onInsideItem, onItem, register]);
 
   return (
     <ZoneWrapper

diff --git a/src/utils/item.js b/src/utils/item.js
@@ -28,9 +28,13 @@ export const areItemsInside = (
 ) => {
   return Object.fromEntries(
     [...itemIds, ...previousIds].map((itemId) => {
+      const elementToTest = getItemElement(itemId);
+      if (!elementToTest) {
+        return [itemId, { inside: false, added: false, removed: true }];
+      }
       const inside = centerOnly
-        ? isItemCenterInsideElement(getItemElement(itemId), element)
-        : isItemInsideElement(getItemElement(itemId), element);
+        ? isItemCenterInsideElement(elementToTest, element)
+        : isItemInsideElement(elementToTest, element);
 
       return [
         itemId,