diff --git a/front/packages/primitives/src/avatar.tsx b/front/packages/primitives/src/avatar.tsx index 0d4336c0..c73a6638 100644 --- a/front/packages/primitives/src/avatar.tsx +++ b/front/packages/primitives/src/avatar.tsx @@ -22,9 +22,9 @@ import { View, ViewStyle } from "react-native"; import { Image } from "./image"; import { useYoshiki, px, Stylable } from "yoshiki/native"; import { Icon } from "./icons"; +import { P } from "./text"; import AccountCircle from "@material-symbols/svg-400/rounded/account_circle-fill.svg"; import { YoshikiStyle } from "yoshiki/dist/type"; -import { P } from "@expo/html-elements"; import { ComponentType, forwardRef, RefAttributes } from "react"; import { ts } from "./utils"; @@ -49,7 +49,7 @@ export const Avatar = forwardRef< { src?: string | null; alt?: string; - size?: YoshikiStyle; + size?: YoshikiStyle; placeholder?: string; color?: string; isLoading?: boolean; diff --git a/front/packages/primitives/src/menu.tsx b/front/packages/primitives/src/menu.tsx index ddd96c33..9db1f0ee 100644 --- a/front/packages/primitives/src/menu.tsx +++ b/front/packages/primitives/src/menu.tsx @@ -50,7 +50,6 @@ const Menu = ({ const [isOpen, setOpen] = useState(false); useEffect(() => { - console.log("Opnned changed", isOpen); if (isOpen) onMenuOpen?.call(null); else onMenuClose?.call(null); }, [isOpen, onMenuClose, onMenuOpen]); diff --git a/front/packages/primitives/src/text.tsx b/front/packages/primitives/src/text.tsx index 4da459ef..c8cdfdca 100644 --- a/front/packages/primitives/src/text.tsx +++ b/front/packages/primitives/src/text.tsx @@ -19,8 +19,8 @@ */ import { ComponentType, ComponentProps } from "react"; -import { Platform, Text, TextProps, TextStyle } from "react-native"; -import { percent, px, rem, useYoshiki } from "yoshiki/native"; +import { Platform, Text, TextProps, TextStyle, StyleProp } from "react-native"; +import { percent, rem, useYoshiki } from "yoshiki/native"; import { H1 as EH1, H2 as EH2, @@ -29,7 +29,6 @@ import { H5 as EH5, H6 as EH6, P as EP, - LI as ELI, } from "@expo/html-elements"; import { ts } from "./utils/spacing"; @@ -38,7 +37,7 @@ const styleText = ( type?: "header" | "sub", custom?: TextStyle, ) => { - const Text = (props: ComponentProps) => { + const Text = (props: Omit, "style"> & { style?: StyleProp }) => { const { css, theme } = useYoshiki(); return (