From acf17015cb00c91b7dff501483cbae936f5c15f6 Mon Sep 17 00:00:00 2001
From: Hugo Lextrait <hugo.lextrait@gmail.com>
Date: Wed, 2 Apr 2025 16:49:17 +0200
Subject: [PATCH 1/2] feat: implement responsive submenu for better mobile
 navigation

---
 src/components/extenders/Menu.tsx | 119 ++++++++++++++++++++++++++----
 1 file changed, 105 insertions(+), 14 deletions(-)

diff --git a/src/components/extenders/Menu.tsx b/src/components/extenders/Menu.tsx
index c6c44f892..c287cf9e0 100644
--- a/src/components/extenders/Menu.tsx
+++ b/src/components/extenders/Menu.tsx
@@ -1,14 +1,17 @@
 import * as DropdownMenu from "@radix-ui/react-dropdown-menu";
 import type { ReactNode } from "react";
-import { useMemo } from "react";
+import { useMemo, useState } from "react";
 import { Fragment } from "react";
 import { useTheme } from "../../context/Theme.context";
 import { mergeClass } from "../../utils/css";
 import type { Component, GetSet } from "../../utils/types";
 import Box, { type BoxProps } from "../primitives/Box";
+import Collapsible from "../primitives/Collapsible";
 import Divider from "../primitives/Divider";
 import EventBlocker from "../primitives/EventBlocker";
 import Icon from "../primitives/Icon";
+import Space from "../primitives/Space";
+import Text from "../primitives/Text";
 import Group from "./Group";
 
 export interface MenuOptions {
@@ -29,6 +32,45 @@ const divide = (element: JSX.Element, index: number, arr: JSX.Element[]) => (
   </Fragment>
 );
 
+export function SubMenuResponsiv({ children, options, size, look, className }: Component<MenuProps & BoxProps>) {
+  const [isOpen, setIsOpen] = useState(false);
+
+  return (
+    <DropdownMenu.Sub>
+      <Group className="flex-col !gap-0">
+        <Group onClick={() => setIsOpen(prev => !prev)}>
+          {
+            <Group className="w-full justify-between" size="xl">
+              {children}
+              <Icon remix="RiArrowDownSLine" />
+            </Group>
+          }
+        </Group>
+        <Collapsible state={[isOpen, setIsOpen]}>
+          <Space size="md" />
+          <Box>
+            {Object.entries(options).map(([key, { label, options: subOptions }]) => {
+              if (subOptions && Object.keys(subOptions).length > 0)
+                return (
+                  <SubMenuResponsiv {...{ size, look, className }} options={subOptions}>
+                    {label}
+                  </SubMenuResponsiv>
+                );
+              return (
+                <DropdownMenu.Item key={key} className="w-full">
+                  <Text size="lg" className="text-main-12">
+                    {label}
+                  </Text>
+                </DropdownMenu.Item>
+              );
+            })}
+          </Box>
+        </Collapsible>
+      </Group>
+    </DropdownMenu.Sub>
+  );
+}
+
 export function SubMenu({ children, options, size, look, className }: Component<MenuProps & BoxProps>) {
   const { vars } = useTheme();
 
@@ -36,7 +78,7 @@ export function SubMenu({ children, options, size, look, className }: Component<
     <DropdownMenu.Sub>
       <DropdownMenu.SubTrigger>
         <Group size="xl" className="w-full justify-between">
-          {children} <Icon remix="RiArrowRightSLine" />
+          {children} <Icon remix="RiArrowDownSLine" />
         </Group>
       </DropdownMenu.SubTrigger>
       <DropdownMenu.Portal>
@@ -74,7 +116,7 @@ export default function Menu({
 }: Component<MenuProps & BoxProps>) {
   const { vars } = useTheme();
 
-  const menu = useMemo(() => {
+  const menuDesktop = useMemo(() => {
     return Object.entries(options)
       .map(([key, { label, options: subOptions }]) => {
         if (subOptions && Object.keys(subOptions).length > 0)
@@ -88,22 +130,71 @@ export default function Menu({
       .map(divide);
   }, [options, size, look, className]);
 
+  const menuResponsiv = useMemo(() => {
+    return Object.entries(options)
+      .map(([key, { label, options: subOptions }]) => {
+        if (subOptions && Object.keys(subOptions).length > 0)
+          return (
+            <SubMenuResponsiv {...{ size, look, className }} options={subOptions}>
+              {label}
+            </SubMenuResponsiv>
+          );
+        return <DropdownMenu.Item key={key}>{label}</DropdownMenu.Item>;
+      })
+      .map(divide);
+  }, [options, size, look, className]);
+
+  // biome-ignore lint/correctness/useExhaustiveDependencies: <explanation>
+  const desktopMenu = useMemo(() => {
+    return (
+      <DropdownMenu.Content
+        className="hidden !pointer-events-auto md:block md:animate-drop md:p-md"
+        asChild
+        style={vars}>
+        <EventBlocker>
+          <Box
+            size={size || "lg"}
+            look={look || "soft"}
+            className={mergeClass("animate-drop text-main-12 bg-main-2 min-w-[24ch] m-lg", className)}
+            {...props}>
+            {menuDesktop}
+          </Box>
+        </EventBlocker>
+      </DropdownMenu.Content>
+    );
+  }, [options, size, look, className, vars, menuDesktop]);
+
+  // biome-ignore lint/correctness/useExhaustiveDependencies: <explanation>
+  const responsivMenu = useMemo(() => {
+    return (
+      <DropdownMenu.Content
+        className="block !pointer-events-auto py-[20px] md:!hidden md:opacity-0"
+        asChild
+        style={vars}>
+        <EventBlocker>
+          <Box
+            size={size || "lg"}
+            look={look || "soft"}
+            className={mergeClass("animate-drop text-main-12 bg-main-2 min-w-[100vw] min-h-[92vh] !rounded-0")}
+            {...props}>
+            {menuResponsiv}
+          </Box>
+        </EventBlocker>
+      </DropdownMenu.Content>
+    );
+  }, [options, size, look, className, vars, menuDesktop]);
+
   return (
     <DropdownMenu.Root open={state?.[0]}>
       <DropdownMenu.Trigger>{children}</DropdownMenu.Trigger>
 
       <DropdownMenu.Portal>
-        <DropdownMenu.Content className="!pointer-events-auto animate-drop p-md" asChild style={vars}>
-          <EventBlocker>
-            <Box
-              size={size || "lg"}
-              look={look || "soft"}
-              className={mergeClass("animate-drop text-main-12 bg-main-2 min-w-[24ch] m-lg", className)}
-              {...props}>
-              {menu}
-            </Box>
-          </EventBlocker>
-        </DropdownMenu.Content>
+        {
+          <>
+            {desktopMenu}
+            {responsivMenu}
+          </>
+        }
       </DropdownMenu.Portal>
     </DropdownMenu.Root>
   );

From 27db558acbff2c740803ef272aab796220c2502b Mon Sep 17 00:00:00 2001
From: Hugo Lextrait <hugo.lextrait@gmail.com>
Date: Wed, 2 Apr 2025 16:52:12 +0200
Subject: [PATCH 2/2] refactor: rename menu variables for clarity and
 consistency

---
 src/components/extenders/Menu.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/extenders/Menu.tsx b/src/components/extenders/Menu.tsx
index c287cf9e0..bf34a9603 100644
--- a/src/components/extenders/Menu.tsx
+++ b/src/components/extenders/Menu.tsx
@@ -116,7 +116,7 @@ export default function Menu({
 }: Component<MenuProps & BoxProps>) {
   const { vars } = useTheme();
 
-  const menuDesktop = useMemo(() => {
+  const desktopMenuItems = useMemo(() => {
     return Object.entries(options)
       .map(([key, { label, options: subOptions }]) => {
         if (subOptions && Object.keys(subOptions).length > 0)
@@ -130,7 +130,7 @@ export default function Menu({
       .map(divide);
   }, [options, size, look, className]);
 
-  const menuResponsiv = useMemo(() => {
+  const responsiveMenuItems = useMemo(() => {
     return Object.entries(options)
       .map(([key, { label, options: subOptions }]) => {
         if (subOptions && Object.keys(subOptions).length > 0)
@@ -157,12 +157,12 @@ export default function Menu({
             look={look || "soft"}
             className={mergeClass("animate-drop text-main-12 bg-main-2 min-w-[24ch] m-lg", className)}
             {...props}>
-            {menuDesktop}
+            {desktopMenuItems}
           </Box>
         </EventBlocker>
       </DropdownMenu.Content>
     );
-  }, [options, size, look, className, vars, menuDesktop]);
+  }, [options, size, look, className, vars, desktopMenuItems]);
 
   // biome-ignore lint/correctness/useExhaustiveDependencies: <explanation>
   const responsivMenu = useMemo(() => {
@@ -177,12 +177,12 @@ export default function Menu({
             look={look || "soft"}
             className={mergeClass("animate-drop text-main-12 bg-main-2 min-w-[100vw] min-h-[92vh] !rounded-0")}
             {...props}>
-            {menuResponsiv}
+            {responsiveMenuItems}
           </Box>
         </EventBlocker>
       </DropdownMenu.Content>
     );
-  }, [options, size, look, className, vars, menuDesktop]);
+  }, [options, size, look, className, vars, desktopMenuItems]);
 
   return (
     <DropdownMenu.Root open={state?.[0]}>