From af9064a35692f77dee9f40747916cb4ba5a33ad8 Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Thu, 6 Jul 2023 19:22:11 -0700
Subject: [PATCH] Some fixes for scrollable dialogs on mobile

This is 100% not going to scale to devices that are not my iPhone 14 Pro Max, but I can't get env variables working in CSS and something is better than nothing for right now.
---
 .../common/DialogContent/index.module.scss    | 75 +------------------
 components/common/DialogContent/index.tsx     | 12 ++-
 .../common/DialogFooter/index.module.scss     |  7 ++
 .../filters/FilterModal/index.module.scss     |  1 +
 components/filters/FilterModal/index.tsx      |  3 +-
 5 files changed, 25 insertions(+), 73 deletions(-)

diff --git a/components/common/DialogContent/index.module.scss b/components/common/DialogContent/index.module.scss
index d701ecab..92df55c2 100644
--- a/components/common/DialogContent/index.module.scss
+++ b/components/common/DialogContent/index.module.scss
@@ -15,6 +15,10 @@
 
   @include breakpoint(phone) {
     place-items: flex-end;
+    overflow-y: hidden;
+
+    &.filter {
+    }
   }
 
   .dialogContent {
@@ -105,77 +109,6 @@
         overflow-y: auto;
       }
     }
-
-    &.Conflict {
-      $weapon-diameter: 14rem;
-
-      .Content {
-        display: flex;
-        flex-direction: column;
-        gap: $unit-4x;
-        padding: $unit-4x $unit-4x $unit-2x $unit-4x;
-
-        & > p {
-          font-size: $font-regular;
-          line-height: 1.4;
-
-          strong {
-            font-weight: $bold;
-          }
-
-          &:lang(ja) {
-            line-height: 1.4;
-          }
-        }
-      }
-
-      .weapon,
-      .character {
-        display: flex;
-        flex-direction: column;
-        gap: $unit;
-        text-align: center;
-        width: $weapon-diameter;
-        font-weight: $medium;
-
-        img {
-          border-radius: 1rem;
-          width: $weapon-diameter;
-          height: auto;
-        }
-
-        span {
-          line-height: 1.3;
-        }
-      }
-
-      footer {
-        display: flex;
-        flex-direction: row;
-        gap: $unit;
-
-        .Button {
-          font-size: $font-regular;
-          padding: ($unit * 1.5) ($unit * 2);
-          width: 100%;
-
-          &.btn-disabled {
-            background: $grey-90;
-            color: $grey-70;
-            cursor: not-allowed;
-          }
-
-          &:not(.btn-disabled) {
-            background: $grey-90;
-            color: $grey-50;
-
-            &:hover {
-              background: $grey-80;
-            }
-          }
-        }
-      }
-    }
   }
 
   @keyframes openModalDesktop {
diff --git a/components/common/DialogContent/index.tsx b/components/common/DialogContent/index.tsx
index 53703c7d..44823b3b 100644
--- a/components/common/DialogContent/index.tsx
+++ b/components/common/DialogContent/index.tsx
@@ -11,6 +11,7 @@ interface Props
     React.DialogHTMLAttributes<HTMLDivElement>,
     HTMLDivElement
   > {
+  wrapperClassName?: string
   headerref?: React.RefObject<HTMLDivElement>
   footerref?: React.RefObject<HTMLDivElement>
   scrollable?: boolean
@@ -127,7 +128,16 @@ const DialogContent = React.forwardRef<HTMLDivElement, Props>(function Dialog(
 
   return (
     <DialogPrimitive.Portal>
-      <dialog className={styles.dialog}>
+      <dialog
+        className={classNames(
+          {
+            [styles.dialog]: true,
+          },
+          props.wrapperClassName
+            ?.split(' ')
+            .map((className) => styles[className])
+        )}
+      >
         <DialogPrimitive.Content
           {...props}
           className={classes}
diff --git a/components/common/DialogFooter/index.module.scss b/components/common/DialogFooter/index.module.scss
index c534e92f..3dd4399a 100644
--- a/components/common/DialogFooter/index.module.scss
+++ b/components/common/DialogFooter/index.module.scss
@@ -16,4 +16,11 @@
     display: flex;
     gap: $unit;
   }
+
+  @include breakpoint(phone) {
+    position: fixed;
+    bottom: $unit-14x;
+    left: 0;
+    right: 0;
+  }
 }
diff --git a/components/filters/FilterModal/index.module.scss b/components/filters/FilterModal/index.module.scss
index e2b68ed2..c1a55e87 100644
--- a/components/filters/FilterModal/index.module.scss
+++ b/components/filters/FilterModal/index.module.scss
@@ -39,5 +39,6 @@
 
   @include breakpoint(phone) {
     gap: $unit-4x;
+    margin-bottom: $unit * 24;
   }
 }
diff --git a/components/filters/FilterModal/index.tsx b/components/filters/FilterModal/index.tsx
index d46cd0cb..ce73f588 100644
--- a/components/filters/FilterModal/index.tsx
+++ b/components/filters/FilterModal/index.tsx
@@ -402,7 +402,8 @@ const FilterModal = (props: Props) => {
     <Dialog open={open} onOpenChange={openChange}>
       <DialogTrigger asChild>{props.children}</DialogTrigger>
       <DialogContent
-        className="Filter"
+        className="filter"
+        wrapperClassName="filter"
         headerref={headerRef}
         footerref={footerRef}
         onEscapeKeyDown={onEscapeKeyDown}