From 253930aac2f73148aec9c7234f9075f58bf52c22 Mon Sep 17 00:00:00 2001
From: Xevion <ryanchwalters@gmail.com>
Date: Wed, 28 Dec 2022 20:19:41 -0600
Subject: [PATCH] Fixed mobile not toggling on/off properly

- Chrome & Firefox Mobile issue
- Despite not having hover in JS, CSS :hover selector was activating
- Tiny, inactive mobile-only button was clickable
- Fixed duplicate key issue in icon links
---
 src/components/ItemCard.tsx | 17 ++++++++++++-----
 src/pages/index.tsx         |  2 +-
 src/styles/globals.scss     | 35 ++++++++++++++++-------------------
 src/utils/helpers.ts        |  8 --------
 4 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/src/components/ItemCard.tsx b/src/components/ItemCard.tsx
index 3b5a5d8..34b70ec 100644
--- a/src/components/ItemCard.tsx
+++ b/src/components/ItemCard.tsx
@@ -1,6 +1,6 @@
 import React, {useRef} from "react";
 import {useOnClickOutside, useToggle} from "usehooks-ts";
-import {classNames, isHoverable, stopPropagation} from "../utils/helpers";
+import {classNames, isHoverable} from "../utils/helpers";
 import DependentImage from "./DependentImage";
 import ReactMarkdown from 'react-markdown'
 
@@ -40,7 +40,11 @@ const ItemCard = ({banner, bannerBlur, title, description, links, location}: Ite
     return <>
         <div ref={itemRef}
              className={classNames("item [&:not(:first-child)]:mt-3", active ? "active" : null)}
-             onClick={navigate}>
+             onClick={() => {
+                 console.log('Overall div!')
+                 navigate();
+             }
+             }>
             <DependentImage fill src={banner} blurDataURL={bannerBlur}
                             className={(loaded) => classNames("object-cover", loaded ? null : "blur-xl")}
                             placeholder="blur"
@@ -52,7 +56,10 @@ const ItemCard = ({banner, bannerBlur, title, description, links, location}: Ite
                     <Link href={{pathname: location}}
                           className="text-lg sm:text-2xl md:text-3xl font-semibold">{title}</Link>
                     <div className="mt-0 md:mt-1.5 text-base sm:text-xl md:text-xl overflow-hidden"
-                         onClick={navigate}
+                         onClick={(e) => {
+                             e.stopPropagation();
+                             navigate();
+                         }}
                          style={{hyphens: "auto"}}>
                         <ReactMarkdown>{description}</ReactMarkdown>
                     </div>
@@ -63,7 +70,7 @@ const ItemCard = ({banner, bannerBlur, title, description, links, location}: Ite
                         <div className="grid grid-cols-2 grid-rows-2 p-2 md:gap-3 aspect-square icon-grid">
                             {links!.map(({icon, location, newTab}) =>
                                 <Link key={location} href={location} target={(newTab ?? true) ? "_blank" : "_self"}
-                                      onClick={stopPropagation}>
+                                      onClick={e => e.stopPropagation()}>
                                     {LinkIcons[icon]!({})}
                                 </Link>)}
                         </div>
@@ -71,7 +78,7 @@ const ItemCard = ({banner, bannerBlur, title, description, links, location}: Ite
             </div>
 
         </div>
-        <Link ref={mobileButtonRef} href={{pathname: location}}
+        <Link aria-disabled={!active} ref={mobileButtonRef} href={active ? {pathname: location} : {}}
               className={classNames(
                   "transition-all bg-zinc-800 rounded border border-zinc-900 shadow w-full flex items-center justify-center",
                   active ? "opacity-100 h-9 p-2" : "opacity-0 h-0 p-0"
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 56373f7..3d23075 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -51,7 +51,7 @@ export async function getStaticProps(context: GetStaticPropsContext) {
                 },
                 {
                     icon: "external",
-                    location: "https://github.com/Xevion/phototag"
+                    location: "https://phototag.xevion.dev"
                 }
             ]
         },
diff --git a/src/styles/globals.scss b/src/styles/globals.scss
index 4c995c6..6834e7e 100644
--- a/src/styles/globals.scss
+++ b/src/styles/globals.scss
@@ -7,6 +7,16 @@
 @tailwind components;
 @tailwind utilities;
 
+@mixin active {
+  .elements {
+    @apply grid opacity-100;
+  }
+
+  > img {
+    @apply blur-2xl;
+  }
+}
+
 html, body {
   @apply font-manrope;
 }
@@ -25,33 +35,20 @@ html, body {
     }
   }
 
-  &:hover, &.active {
-    .elements {
-      @apply grid opacity-100;
-    }
-
-    > img {
-      @apply blur-2xl;
+  @media (hover: hover) and (pointer: fine) {
+    &:hover {
+      @include active;
     }
   }
-}
 
-.stepped {
-  @apply text-white text-8xl;
-  font-family: monospace;
-
-  > span {
-    @apply transition-colors delay-300;
-
-    &:hover, &.active {
-      @apply text-black bg-white;
-      transition-delay: 0s;
-    }
+  &.active {
+    @include active;
   }
 }
 
 .icon-grid {
   direction: rtl;
+  @apply min-w-0 max-w-full min-h-0 max-h-full;
 
   > a > svg {
     @apply w-full h-full;
diff --git a/src/utils/helpers.ts b/src/utils/helpers.ts
index c992d4d..b8d3d70 100644
--- a/src/utils/helpers.ts
+++ b/src/utils/helpers.ts
@@ -6,14 +6,6 @@ export function classNames(...classes: (string | null | undefined)[]) {
     return classes.filter(Boolean).join(" ");
 }
 
-/**
- * A handler that simply calls the `stopPropagation` method on an event.
- * @param event The event to prevent propagation on.
- */
-export const stopPropagation = (event: Event) => {
-    event.stopPropagation();
-};
-
 const isClient = (): boolean => {
     return typeof window !== "undefined";
 }