diff --git a/front/packages/primitives/src/menu.tsx b/front/packages/primitives/src/menu.tsx index 679177d6..da023622 100644 --- a/front/packages/primitives/src/menu.tsx +++ b/front/packages/primitives/src/menu.tsx @@ -20,7 +20,15 @@ import { Portal } from "@gorhom/portal"; import { ScrollView } from "moti"; -import { ComponentType, createContext, ReactElement, ReactNode, useContext, useEffect, useState } from "react"; +import { + ComponentType, + createContext, + ReactElement, + ReactNode, + useContext, + useEffect, + useState, +} from "react"; import { StyleSheet, Pressable } from "react-native"; import { percent, px, sm, useYoshiki, xl } from "yoshiki/native"; import Close from "@material-symbols/svg-400/rounded/close-fill.svg"; @@ -56,7 +64,7 @@ const Menu = ({ return ( <> - setOpen(true)} {...props as any} /> + setOpen(true)} {...(props as any)} /> {isOpen && ( @@ -129,7 +137,14 @@ const MenuItem = ({ const setOpen = useContext(MenuContext); const router = useRouter(); - const icn = (icon || selected) && ; + const icn = (icon || selected) && ( + + ); return ( {left && left} {!left && icn && icn} -

{label}

+

+ {label} +

{left && icn && icn}
); diff --git a/front/packages/primitives/src/menu.web.tsx b/front/packages/primitives/src/menu.web.tsx index f4bd61d2..2b910297 100644 --- a/front/packages/primitives/src/menu.web.tsx +++ b/front/packages/primitives/src/menu.web.tsx @@ -23,7 +23,7 @@ import { ComponentProps, ComponentType, forwardRef, ReactElement, ReactNode } fr import Link from "next/link"; import { PressableProps } from "react-native"; import { useYoshiki } from "yoshiki/web"; -import { px, useYoshiki as useNativeYoshiki } from "yoshiki/native"; +import { px, useYoshiki as useNativeYoshiki, calc } from "yoshiki/native"; import { P } from "./text"; import { ContrastArea, SwitchVariant } from "./themes"; import { Icon } from "./icons"; @@ -133,6 +133,15 @@ const MenuItem = ({ const { css: nCss } = useNativeYoshiki(); const { css, theme } = useYoshiki(); + const icn = (icon || selected) && ( + + ); + return ( <>