From f98a4c7caa4670dc3eaf725c4c46f8a4eb6a2b89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Mon, 8 Apr 2024 19:10:02 -0500
Subject: [PATCH] fix: button popover order

---
 src/app/tools/compare/page.tsx | 115 ++++++++++++++++-----------------
 1 file changed, 57 insertions(+), 58 deletions(-)

diff --git a/src/app/tools/compare/page.tsx b/src/app/tools/compare/page.tsx
index 851660951..d4994fecd 100644
--- a/src/app/tools/compare/page.tsx
+++ b/src/app/tools/compare/page.tsx
@@ -771,9 +771,9 @@ export default function Page() {
                             </Popover.Root>
                           </Flex>
 
-                          <Button variant="ghost" radius="large">
-                            <Popover.Root>
-                              <Popover.Trigger>
+                          <Popover.Root>
+                            <Popover.Trigger>
+                              <Button variant="ghost">
                                 <Flex align="center">
                                   {(
                                     [
@@ -796,66 +796,65 @@ export default function Page() {
                                     />
                                   ))}
                                 </Flex>
-                              </Popover.Trigger>
+                              </Button>
+                            </Popover.Trigger>
 
-                              <Popover.Content>
-                                <ModuleManager
-                                  tank={tank}
-                                  turret={turret}
-                                  gun={gun}
-                                  shell={shell}
-                                  engine={engine}
-                                  track={track}
-                                  onChange={(modules) => {
+                            <Popover.Content>
+                              <ModuleManager
+                                tank={tank}
+                                turret={turret}
+                                gun={gun}
+                                shell={shell}
+                                engine={engine}
+                                track={track}
+                                onChange={(modules) => {
+                                  mutateCompareTemporary((draft) => {
+                                    draft.members[index] = {
+                                      ...draft.members[index],
+                                      ...modules,
+                                    };
+                                  });
+                                }}
+                              />
+
+                              <Flex justify="end" mt="4" gap="4">
+                                <Button
+                                  variant="ghost"
+                                  onClick={() => {
                                     mutateCompareTemporary((draft) => {
-                                      draft.members[index] = {
-                                        ...draft.members[index],
-                                        ...modules,
-                                      };
+                                      const member = draft.members[index];
+
+                                      member.turret = member.tank.turrets[0];
+                                      member.gun = member.turret.guns[0];
+                                      member.shell = member.gun.shells[0];
+                                      member.engine = member.tank.engines[0];
+                                      member.track = member.tank.tracks[0];
                                     });
                                   }}
-                                />
+                                >
+                                  Stock
+                                </Button>
+                                <Button
+                                  variant="ghost"
+                                  onClick={() => {
+                                    mutateCompareTemporary((draft) => {
+                                      const member = draft.members[index];
 
-                                <Flex justify="end" mt="4" gap="4">
-                                  <Button
-                                    variant="ghost"
-                                    onClick={() => {
-                                      mutateCompareTemporary((draft) => {
-                                        const member = draft.members[index];
-
-                                        member.turret = member.tank.turrets[0];
-                                        member.gun = member.turret.guns[0];
-                                        member.shell = member.gun.shells[0];
-                                        member.engine = member.tank.engines[0];
-                                        member.track = member.tank.tracks[0];
-                                      });
-                                    }}
-                                  >
-                                    Stock
-                                  </Button>
-                                  <Button
-                                    variant="ghost"
-                                    onClick={() => {
-                                      mutateCompareTemporary((draft) => {
-                                        const member = draft.members[index];
-
-                                        member.turret =
-                                          member.tank.turrets.at(-1)!;
-                                        member.gun = member.turret.guns.at(-1)!;
-                                        member.shell = member.gun.shells[0];
-                                        member.engine =
-                                          member.tank.engines.at(-1)!;
-                                        member.track =
-                                          member.tank.tracks.at(-1)!;
-                                      });
-                                    }}
-                                  >
-                                    Upgrade
-                                  </Button>
-                                </Flex>
-                              </Popover.Content>
-                            </Popover.Root>
-                          </Button>
+                                      member.turret =
+                                        member.tank.turrets.at(-1)!;
+                                      member.gun = member.turret.guns.at(-1)!;
+                                      member.shell = member.gun.shells[0];
+                                      member.engine =
+                                        member.tank.engines.at(-1)!;
+                                      member.track = member.tank.tracks.at(-1)!;
+                                    });
+                                  }}
+                                >
+                                  Upgrade
+                                </Button>
+                              </Flex>
+                            </Popover.Content>
+                          </Popover.Root>
                         </Flex>
                       </Table.Cell>
                     );