From d623431386efc04db8b23c8df388375eafb12d76 Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Tue, 21 Mar 2023 06:23:46 -0700
Subject: [PATCH] GridRep adjustments

* Properly unset mainhand when cells get reused and the new team doesnt have one
* Slightly better styling to make the grid more correct
---
 components/GridRep/index.scss |  7 +++++--
 components/GridRep/index.tsx  | 11 +++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/components/GridRep/index.scss b/components/GridRep/index.scss
index 02a480b0..e4108c84 100644
--- a/components/GridRep/index.scss
+++ b/components/GridRep/index.scss
@@ -35,9 +35,9 @@
   }
 
   & > .Grid {
-    aspect-ratio: 2/1;
+    aspect-ratio: 2/0.95;
     display: grid;
-    grid-template-columns: 1fr 3fr; /* left column takes up 1 fraction, right column takes up 3 fractions */
+    grid-template-columns: 1fr 3.36fr; /* left column takes up 1 fraction, right column takes up 3 fractions */
     grid-gap: $unit; /* add a gap of 8px between grid items */
 
     .Weapon {
@@ -49,6 +49,7 @@
       aspect-ratio: 73/153;
       display: grid;
       grid-column: 1 / 2; /* spans one column */
+      max-height: 140px;
     }
 
     .GridWeapons {
@@ -62,6 +63,8 @@
         1fr
       ); /* create 3 rows, each taking up 1 fraction */
       gap: $unit;
+      // column-gap: $unit;
+      // row-gap: $unit-2x;
     }
 
     .Grid.Weapon {
diff --git a/components/GridRep/index.tsx b/components/GridRep/index.tsx
index f9a50e3f..607c41f5 100644
--- a/components/GridRep/index.tsx
+++ b/components/GridRep/index.tsx
@@ -62,14 +62,21 @@ const GridRep = (props: Props) => {
     const newWeapons = Array(numWeapons)
     const gridWeapons = Array(numWeapons)
 
+    let foundMainhand = false
     for (const [key, value] of Object.entries(props.grid)) {
-      if (value.position == -1) setMainhand(value.object)
-      else if (!value.mainhand && value.position != null) {
+      if (value.position == -1) {
+        setMainhand(value.object)
+        foundMainhand = true
+      } else if (!value.mainhand && value.position != null) {
         newWeapons[value.position] = value.object
         gridWeapons[value.position] = value
       }
     }
 
+    if (!foundMainhand) {
+      setMainhand(undefined)
+    }
+
     setWeapons(newWeapons)
     setGrid(gridWeapons)
   }, [props.grid])