From c40bca2460f8cda3ce8f9b3285b727dd43a8f65c Mon Sep 17 00:00:00 2001
From: Sonny <sonnyasdev@gmail.com>
Date: Tue, 23 May 2023 17:43:30 +0200
Subject: [PATCH] feat: escape shortcut redirect to home page + page transition
 for all pages

---
 src/components/PageTransition.tsx             | 25 +++++++++++
 src/components/SearchModal/SearchList.tsx     |  7 ++-
 src/components/SearchModal/SearchListItem.tsx | 45 ++++++-------------
 src/components/SearchModal/SearchModal.tsx    |  4 +-
 src/pages/_app.tsx                            |  7 +++
 src/pages/category/create.tsx                 |  8 ++--
 src/pages/category/edit/[cid].tsx             |  6 +--
 src/pages/category/remove/[cid].tsx           |  5 ++-
 src/pages/index.tsx                           | 19 +++-----
 src/pages/link/create.tsx                     |  6 +--
 src/pages/link/edit/[lid].tsx                 |  6 +--
 src/pages/link/remove/[lid].tsx               |  5 ++-
 src/utils/client.ts                           |  1 +
 13 files changed, 76 insertions(+), 68 deletions(-)
 create mode 100644 src/components/PageTransition.tsx

diff --git a/src/components/PageTransition.tsx b/src/components/PageTransition.tsx
new file mode 100644
index 0000000..e08e2f8
--- /dev/null
+++ b/src/components/PageTransition.tsx
@@ -0,0 +1,25 @@
+import { motion } from "framer-motion";
+import { ReactNode } from "react";
+
+export default function PageTransition({
+  className,
+  children,
+}: {
+  className: string;
+  children: ReactNode;
+}) {
+  return (
+    <motion.div
+      className={className}
+      initial={{ opacity: 0, scale: 0.95 }}
+      animate={{ opacity: 1, scale: 1 }}
+      transition={{
+        type: "spring",
+        stiffness: 260,
+        damping: 20,
+      }}
+    >
+      {children}
+    </motion.div>
+  );
+}
diff --git a/src/components/SearchModal/SearchList.tsx b/src/components/SearchModal/SearchList.tsx
index aa24915..5b93a6d 100644
--- a/src/components/SearchModal/SearchList.tsx
+++ b/src/components/SearchModal/SearchList.tsx
@@ -10,12 +10,12 @@ export default function SearchList({
   items,
   noItem,
   cursor,
-  setCursor,
+  closeModal,
 }: {
   items: SearchItem[];
   noItem?: ReactNode;
   cursor: number;
-  setCursor: (cursor: number) => void;
+  closeModal: () => void;
 }) {
   const searchItemsGrouped = useMemo(
     () => groupItemBy(items, "category.name"),
@@ -35,9 +35,8 @@ export default function SearchList({
             {items.map((item) => (
               <SearchListItem
                 item={item}
-                setCursor={setCursor}
                 selected={index === cursor}
-                index={index}
+                closeModal={closeModal}
                 key={item.id}
               />
             ))}
diff --git a/src/components/SearchModal/SearchListItem.tsx b/src/components/SearchModal/SearchListItem.tsx
index 9f9e89f..4b60dab 100644
--- a/src/components/SearchModal/SearchListItem.tsx
+++ b/src/components/SearchModal/SearchListItem.tsx
@@ -1,65 +1,48 @@
-import { motion } from "framer-motion";
 import LinkTag from "next/link";
 import { AiOutlineFolder } from "react-icons/ai";
 
 import LinkFavicon from "components/Links/LinkFavicon";
 import { SearchItem } from "types";
 
-import { useEffect, useId, useRef, useState } from "react";
+import { useEffect, useId, useRef } from "react";
 import styles from "./search.module.scss";
 
 export default function SearchListItem({
   item,
-  index,
   selected,
-  setCursor,
+  closeModal,
 }: {
   item: SearchItem;
-  index?: number;
   selected: boolean;
-  setCursor: (cursor: number) => void;
+  closeModal: () => void;
 }) {
   const id = useId();
   const ref = useRef<HTMLLIElement>(null);
 
-  const [isHover, setHover] = useState<boolean>(false);
-
   const { name, type, url } = item;
 
   useEffect(() => {
-    if (selected && !isHover) {
+    if (selected) {
       ref.current?.scrollIntoView({ behavior: "smooth", block: "center" });
     }
-  }, [isHover, selected]);
+  }, [selected]);
 
   return (
-    <motion.li
-      className={styles["search-item"]}
-      initial={{ y: -15, opacity: 0 }}
-      animate={{ y: 0, opacity: 1 }}
-      transition={{
-        type: "spring",
-        stiffness: 260,
-        damping: 20,
-        delay: index * 0.025,
-      }}
-      ref={ref}
-      onMouseEnter={() => {
-        setCursor(index);
-        setHover(true);
-      }}
-      onMouseLeave={() => setHover(false)}
-      key={id}
-    >
-      <LinkTag href={url} target="_blank" rel="no-referrer">
+    <li className={styles["search-item"]} ref={ref} key={id}>
+      <LinkTag
+        href={url}
+        target="_blank"
+        rel="no-referrer"
+        onClick={closeModal}
+      >
         {type === "link" ? (
           <LinkFavicon url={item.url} noMargin size={24} />
         ) : (
           <AiOutlineFolder size={24} />
         )}
         <span>{name}</span>
-        {selected && "selected"}
+        {selected && "[selected]"}
       </LinkTag>
-    </motion.li>
+    </li>
   );
 }
diff --git a/src/components/SearchModal/SearchModal.tsx b/src/components/SearchModal/SearchModal.tsx
index 307289e..6c3f9fe 100644
--- a/src/components/SearchModal/SearchModal.tsx
+++ b/src/components/SearchModal/SearchModal.tsx
@@ -11,8 +11,8 @@ import SearchList from "./SearchList";
 
 import * as Keys from "constants/keys";
 import { GOOGLE_SEARCH_URL } from "constants/search-urls";
-import { Category, SearchItem } from "types";
 import { useLocalStorage } from "hooks/useLocalStorage";
+import { Category, SearchItem } from "types";
 
 import styles from "./search.module.scss";
 
@@ -134,7 +134,7 @@ export default function SearchModal({
             items={itemsCompletion}
             noItem={<LabelSearchWithGoogle />}
             cursor={cursor}
-            setCursor={setCursor}
+            closeModal={close}
           />
         )}
         <button type="submit" disabled={!canSubmit} style={{ display: "none" }}>
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index cc71b3c..2a810e2 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -3,8 +3,10 @@ import { DefaultSeo } from "next-seo";
 import { useRouter } from "next/router";
 import nProgress from "nprogress";
 import { useEffect } from "react";
+import { useHotkeys } from "react-hotkeys-hook";
 
 import AuthRequired from "components/AuthRequired";
+import * as Keys from "constants/keys";
 
 import "nprogress/nprogress.css";
 import "styles/globals.scss";
@@ -12,6 +14,11 @@ import "styles/globals.scss";
 function MyApp({ Component, pageProps: { session, ...pageProps } }) {
   const router = useRouter();
 
+  useHotkeys(Keys.CLOSE_SEARCH_KEY, () => router.push("/"), {
+    enabled: router.pathname !== "/",
+    enableOnFormTags: ["INPUT"],
+  });
+
   useEffect(() => {
     // Chargement pages
     router.events.on("routeChangeStart", nProgress.start);
diff --git a/src/pages/category/create.tsx b/src/pages/category/create.tsx
index d354c08..c609806 100644
--- a/src/pages/category/create.tsx
+++ b/src/pages/category/create.tsx
@@ -3,11 +3,11 @@ import { useRouter } from "next/router";
 import nProgress from "nprogress";
 import { useMemo, useState } from "react";
 
-import useAutoFocus from "hooks/useAutoFocus";
-
 import FormLayout from "components/FormLayout";
+import PageTransition from "components/PageTransition";
 import TextBox from "components/TextBox";
 
+import useAutoFocus from "hooks/useAutoFocus";
 import { redirectWithoutClientCache } from "utils/client";
 import { HandleAxiosError } from "utils/front";
 
@@ -48,7 +48,7 @@ function CreateCategory() {
   };
 
   return (
-    <>
+    <PageTransition className="page-category-create">
       <FormLayout
         title="Créer une catégorie"
         errorMessage={error}
@@ -66,7 +66,7 @@ function CreateCategory() {
           innerRef={autoFocusRef}
         />
       </FormLayout>
-    </>
+    </PageTransition>
   );
 }
 
diff --git a/src/pages/category/edit/[cid].tsx b/src/pages/category/edit/[cid].tsx
index d27b841..a24410e 100644
--- a/src/pages/category/edit/[cid].tsx
+++ b/src/pages/category/edit/[cid].tsx
@@ -4,10 +4,10 @@ import nProgress from "nprogress";
 import { useMemo, useState } from "react";
 
 import FormLayout from "components/FormLayout";
+import PageTransition from "components/PageTransition";
 import TextBox from "components/TextBox";
 
 import useAutoFocus from "hooks/useAutoFocus";
-
 import { Category } from "types";
 import { prisma } from "utils/back";
 import { BuildCategory, HandleAxiosError } from "utils/front";
@@ -51,7 +51,7 @@ function EditCategory({ category }: { category: Category }) {
   };
 
   return (
-    <>
+    <PageTransition className="page-category-edit">
       <FormLayout
         title="Modifier une catégorie"
         errorMessage={error}
@@ -68,7 +68,7 @@ function EditCategory({ category }: { category: Category }) {
           innerRef={autoFocusRef}
         />
       </FormLayout>
-    </>
+    </PageTransition>
   );
 }
 
diff --git a/src/pages/category/remove/[cid].tsx b/src/pages/category/remove/[cid].tsx
index 86c6e1e..63ea52e 100644
--- a/src/pages/category/remove/[cid].tsx
+++ b/src/pages/category/remove/[cid].tsx
@@ -5,6 +5,7 @@ import { useMemo, useState } from "react";
 
 import Checkbox from "components/Checkbox";
 import FormLayout from "components/FormLayout";
+import PageTransition from "components/PageTransition";
 import TextBox from "components/TextBox";
 
 import { Category } from "types";
@@ -47,7 +48,7 @@ function RemoveCategory({ category }: { category: Category }) {
   };
 
   return (
-    <>
+    <PageTransition className="page-category-remove">
       <FormLayout
         title="Supprimer une catégorie"
         categoryId={category.id.toString()}
@@ -72,7 +73,7 @@ function RemoveCategory({ category }: { category: Category }) {
           onChangeCallback={(checked) => setConfirmDelete(checked)}
         />
       </FormLayout>
-    </>
+    </PageTransition>
   );
 }
 
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index e2e1149..533dca6 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -1,15 +1,15 @@
+import { AnimatePresence } from "framer-motion";
 import { useRouter } from "next/router";
 import { useCallback, useMemo, useState } from "react";
 import { useHotkeys } from "react-hotkeys-hook";
 
-import useModal from "hooks/useModal";
-
 import Links from "components/Links/Links";
+import PageTransition from "components/PageTransition";
 import SearchModal from "components/SearchModal/SearchModal";
 import SideMenu from "components/SideMenu/SideMenu";
 
 import * as Keys from "constants/keys";
-import { AnimatePresence, motion } from "framer-motion";
+import useModal from "hooks/useModal";
 import { Category, Link, SearchItem } from "types";
 import { prisma } from "utils/back";
 import { BuildCategory } from "utils/front";
@@ -157,16 +157,7 @@ function Home(props: HomeProps) {
   );
 
   return (
-    <motion.div
-      className="App"
-      initial={{ opacity: 0, scale: 0.85 }}
-      animate={{ opacity: 1, scale: 1 }}
-      transition={{
-        type: "spring",
-        stiffness: 260,
-        damping: 20,
-      }}
-    >
+    <PageTransition className="App">
       <SideMenu
         categories={categories}
         favorites={favorites}
@@ -185,7 +176,7 @@ function Home(props: HomeProps) {
           />
         )}
       </AnimatePresence>
-    </motion.div>
+    </PageTransition>
   );
 }
 
diff --git a/src/pages/link/create.tsx b/src/pages/link/create.tsx
index 7e518d0..010e04c 100644
--- a/src/pages/link/create.tsx
+++ b/src/pages/link/create.tsx
@@ -5,11 +5,11 @@ import { useMemo, useState } from "react";
 
 import Checkbox from "components/Checkbox";
 import FormLayout from "components/FormLayout";
+import PageTransition from "components/PageTransition";
 import Selector from "components/Selector";
 import TextBox from "components/TextBox";
 
 import useAutoFocus from "hooks/useAutoFocus";
-
 import { Category, Link } from "types";
 import { prisma } from "utils/back";
 import { BuildCategory, HandleAxiosError, IsValidURL } from "utils/front";
@@ -61,7 +61,7 @@ function CreateLink({ categories }: { categories: Category[] }) {
   };
 
   return (
-    <>
+    <PageTransition className="page-link-create">
       <FormLayout
         title="Créer un lien"
         categoryId={categoryIdQuery}
@@ -103,7 +103,7 @@ function CreateLink({ categories }: { categories: Category[] }) {
           label="Favoris"
         />
       </FormLayout>
-    </>
+    </PageTransition>
   );
 }
 
diff --git a/src/pages/link/edit/[lid].tsx b/src/pages/link/edit/[lid].tsx
index 70ff410..01fbd66 100644
--- a/src/pages/link/edit/[lid].tsx
+++ b/src/pages/link/edit/[lid].tsx
@@ -5,11 +5,11 @@ import { useMemo, useState } from "react";
 
 import Checkbox from "components/Checkbox";
 import FormLayout from "components/FormLayout";
+import PageTransition from "components/PageTransition";
 import Selector from "components/Selector";
 import TextBox from "components/TextBox";
 
 import useAutoFocus from "hooks/useAutoFocus";
-
 import { Category, Link } from "types";
 import { prisma } from "utils/back";
 import {
@@ -85,7 +85,7 @@ function EditLink({
   };
 
   return (
-    <>
+    <PageTransition className="page-link-edit">
       <FormLayout
         title="Modifier un lien"
         errorMessage={error}
@@ -126,7 +126,7 @@ function EditLink({
           label="Favoris"
         />
       </FormLayout>
-    </>
+    </PageTransition>
   );
 }
 
diff --git a/src/pages/link/remove/[lid].tsx b/src/pages/link/remove/[lid].tsx
index 89a8d66..3f1fd0d 100644
--- a/src/pages/link/remove/[lid].tsx
+++ b/src/pages/link/remove/[lid].tsx
@@ -5,6 +5,7 @@ import { useMemo, useState } from "react";
 
 import Checkbox from "components/Checkbox";
 import FormLayout from "components/FormLayout";
+import PageTransition from "components/PageTransition";
 import TextBox from "components/TextBox";
 
 import { Link } from "types";
@@ -42,7 +43,7 @@ function RemoveLink({ link }: { link: Link }) {
   };
 
   return (
-    <>
+    <PageTransition className="page-link-remove">
       <FormLayout
         title="Supprimer un lien"
         categoryId={link.category.id.toString()}
@@ -86,7 +87,7 @@ function RemoveLink({ link }: { link: Link }) {
           onChangeCallback={(checked) => setConfirmDelete(checked)}
         />
       </FormLayout>
-    </>
+    </PageTransition>
   );
 }
 
diff --git a/src/utils/client.ts b/src/utils/client.ts
index 6f9085a..e338c84 100644
--- a/src/utils/client.ts
+++ b/src/utils/client.ts
@@ -4,4 +4,5 @@ export function redirectWithoutClientCache(router: NextRouter, url: string) {
   router.push(url, undefined, {
     unstable_skipClientCache: true,
   });
+  // FIXME: invalidate catch instead of weird hack
 }