From dc3ca01df3870f5ef43b0e4654aa84fa46f034d8 Mon Sep 17 00:00:00 2001 From: Innei Date: Mon, 12 Aug 2024 22:06:49 +0800 Subject: [PATCH] fix: star icon place in grid template Signed-off-by: Innei --- .../src/components/ui/marquee/index.tsx | 15 ++++++- .../src/modules/entry-column/star-icon.tsx | 11 ++++- .../templates/grid-item-template.tsx | 44 ++++++++++--------- 3 files changed, 47 insertions(+), 23 deletions(-) diff --git a/src/renderer/src/components/ui/marquee/index.tsx b/src/renderer/src/components/ui/marquee/index.tsx index f4387d048..2a31eb57e 100644 --- a/src/renderer/src/components/ui/marquee/index.tsx +++ b/src/renderer/src/components/ui/marquee/index.tsx @@ -7,14 +7,19 @@ export const TitleMarquee = ({ children, speed = 30, play, + className, ...rest -}: PropsWithChildren & MarqueeProps) => { +}: PropsWithChildren & +MarqueeProps & { + className?: string +}) => { const [hovered, setHovered] = useState(false) const ref = useRef(null) const $wrapper = useRef(null) return (
{ @@ -49,7 +54,13 @@ export const TitleMarquee = ({ }) }, [])} > - + {children} diff --git a/src/renderer/src/modules/entry-column/star-icon.tsx b/src/renderer/src/modules/entry-column/star-icon.tsx index d32d2abf4..5dabf6920 100644 --- a/src/renderer/src/modules/entry-column/star-icon.tsx +++ b/src/renderer/src/modules/entry-column/star-icon.tsx @@ -1 +1,10 @@ -export const StarIcon = () => +import { cn } from "@renderer/lib/utils" + +export const StarIcon: Component = ({ className }) => ( + +) diff --git a/src/renderer/src/modules/entry-column/templates/grid-item-template.tsx b/src/renderer/src/modules/entry-column/templates/grid-item-template.tsx index 296f992ed..921ae9cd3 100644 --- a/src/renderer/src/modules/entry-column/templates/grid-item-template.tsx +++ b/src/renderer/src/modules/entry-column/templates/grid-item-template.tsx @@ -30,26 +30,30 @@ export function GridItem({ return (
{children} -
-
- - - - {!!entry.collections && } +
+
+
+
+ + + + {!!entry.collections && ( + + )} +