From 9d5d67601c5c0b615615c3082508ac89df5634db Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Mon, 2 Jan 2023 21:31:18 -0800
Subject: [PATCH] Use Dialog in ConflictModals

---
 components/CharacterConflictModal/index.tsx | 83 ++++++++++-----------
 components/WeaponConflictModal/index.tsx    | 76 +++++++++----------
 2 files changed, 79 insertions(+), 80 deletions(-)

diff --git a/components/CharacterConflictModal/index.tsx b/components/CharacterConflictModal/index.tsx
index 6493b215..f6ab100f 100644
--- a/components/CharacterConflictModal/index.tsx
+++ b/components/CharacterConflictModal/index.tsx
@@ -2,12 +2,12 @@ import React, { useEffect, useState } from 'react'
 import { useRouter } from 'next/router'
 import { Trans, useTranslation } from 'next-i18next'
 
-import * as Dialog from '@radix-ui/react-dialog'
+import { Dialog, DialogContent } from '~components/Dialog'
+import Button from '~components/Button'
+import Overlay from '~components/Overlay'
 
 import { appState } from '~utils/appState'
 
-import Button from '~components/Button'
-
 import './index.scss'
 
 interface Props {
@@ -68,49 +68,48 @@ const CharacterConflictModal = (props: Props) => {
   }
 
   return (
-    <Dialog.Root open={open} onOpenChange={openChange}>
-      <Dialog.Portal>
-        <Dialog.Content
-          className="Conflict Dialog"
-          onOpenAutoFocus={(event) => event.preventDefault()}
-        >
-          <p>
-            <Trans i18nKey="modals.conflict.character"></Trans>
-          </p>
-          <div className="CharacterDiagram Diagram">
-            <ul>
-              {props.conflictingCharacters?.map((character, i) => (
-                <li className="character" key={`conflict-${i}`}>
-                  <img
-                    alt={character.object.name[locale]}
-                    src={imageUrl(character.object, character.uncap_level)}
-                  />
-                  <span>{character.object.name[locale]}</span>
-                </li>
-              ))}
-            </ul>
-            <span className="arrow">&rarr;</span>
-            <div className="wrapper">
-              <div className="character">
+    <Dialog open={open} onOpenChange={openChange}>
+      <DialogContent
+        className="Conflict Dialog"
+        onOpenAutoFocus={(event) => event.preventDefault()}
+        onEscapeKeyDown={close}
+      >
+        <p>
+          <Trans i18nKey="modals.conflict.character"></Trans>
+        </p>
+        <div className="CharacterDiagram Diagram">
+          <ul>
+            {props.conflictingCharacters?.map((character, i) => (
+              <li className="character" key={`conflict-${i}`}>
                 <img
-                  alt={props.incomingCharacter?.name[locale]}
-                  src={imageUrl(props.incomingCharacter)}
+                  alt={character.object.name[locale]}
+                  src={imageUrl(character.object, character.uncap_level)}
                 />
-                <span>{props.incomingCharacter?.name[locale]}</span>
-              </div>
+                <span>{character.object.name[locale]}</span>
+              </li>
+            ))}
+          </ul>
+          <span className="arrow">&rarr;</span>
+          <div className="wrapper">
+            <div className="character">
+              <img
+                alt={props.incomingCharacter?.name[locale]}
+                src={imageUrl(props.incomingCharacter)}
+              />
+              <span>{props.incomingCharacter?.name[locale]}</span>
             </div>
           </div>
-          <footer>
-            <Button onClick={close} text={t('buttons.cancel')} />
-            <Button
-              onClick={props.resolveConflict}
-              text={t('modals.conflict.buttons.confirm')}
-            />
-          </footer>
-        </Dialog.Content>
-        <Dialog.Overlay className="Overlay" />
-      </Dialog.Portal>
-    </Dialog.Root>
+        </div>
+        <footer>
+          <Button onClick={close} text={t('buttons.cancel')} />
+          <Button
+            onClick={props.resolveConflict}
+            text={t('modals.conflict.buttons.confirm')}
+          />
+        </footer>
+      </DialogContent>
+      <Overlay open={open} visible={true} />
+    </Dialog>
   )
 }
 
diff --git a/components/WeaponConflictModal/index.tsx b/components/WeaponConflictModal/index.tsx
index 5ace6a00..ce7b6620 100644
--- a/components/WeaponConflictModal/index.tsx
+++ b/components/WeaponConflictModal/index.tsx
@@ -2,8 +2,9 @@ import React, { useEffect, useState } from 'react'
 import { useRouter } from 'next/router'
 import { Trans, useTranslation } from 'react-i18next'
 
-import * as Dialog from '@radix-ui/react-dialog'
+import { Dialog, DialogContent } from '~components/Dialog'
 import Button from '~components/Button'
+import Overlay from '~components/Overlay'
 
 import mapWeaponSeries from '~utils/mapWeaponSeries'
 
@@ -62,47 +63,46 @@ const WeaponConflictModal = (props: Props) => {
   }
 
   return (
-    <Dialog.Root open={open} onOpenChange={openChange}>
-      <Dialog.Portal>
-        <Dialog.Content
-          className="Conflict Dialog"
-          onOpenAutoFocus={(event) => event.preventDefault()}
-        >
-          <p>{infoString()}</p>
-          <div className="WeaponDiagram Diagram">
-            <ul>
-              {props.conflictingWeapons?.map((weapon, i) => (
-                <li className="weapon" key={`conflict-${i}`}>
-                  <img
-                    alt={weapon.object.name[locale]}
-                    src={imageUrl(weapon.object)}
-                  />
-                  <span>{weapon.object.name[locale]}</span>
-                </li>
-              ))}
-            </ul>
-            <span className="arrow">&rarr;</span>
-            <div className="wrapper">
-              <div className="weapon">
+    <Dialog open={open} onOpenChange={openChange}>
+      <DialogContent
+        className="Conflict Dialog"
+        onOpenAutoFocus={(event) => event.preventDefault()}
+        onEscapeKeyDown={close}
+      >
+        <p>{infoString()}</p>
+        <div className="WeaponDiagram Diagram">
+          <ul>
+            {props.conflictingWeapons?.map((weapon, i) => (
+              <li className="weapon" key={`conflict-${i}`}>
                 <img
-                  alt={props.incomingWeapon?.name[locale]}
-                  src={imageUrl(props.incomingWeapon)}
+                  alt={weapon.object.name[locale]}
+                  src={imageUrl(weapon.object)}
                 />
-                {props.incomingWeapon?.name[locale]}
-              </div>
+                <span>{weapon.object.name[locale]}</span>
+              </li>
+            ))}
+          </ul>
+          <span className="arrow">&rarr;</span>
+          <div className="wrapper">
+            <div className="weapon">
+              <img
+                alt={props.incomingWeapon?.name[locale]}
+                src={imageUrl(props.incomingWeapon)}
+              />
+              {props.incomingWeapon?.name[locale]}
             </div>
           </div>
-          <footer>
-            <Button onClick={close} text={t('buttons.cancel')} />
-            <Button
-              onClick={props.resolveConflict}
-              text={t('modals.conflict.buttons.confirm')}
-            />
-          </footer>
-        </Dialog.Content>
-        <Dialog.Overlay className="Overlay" />
-      </Dialog.Portal>
-    </Dialog.Root>
+        </div>
+        <footer>
+          <Button onClick={close} text={t('buttons.cancel')} />
+          <Button
+            onClick={props.resolveConflict}
+            text={t('modals.conflict.buttons.confirm')}
+          />
+        </footer>
+      </DialogContent>
+      <Overlay open={open} visible={true} />
+    </Dialog>
   )
 }