Skip to content

fix: framer issue fixes #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lassiecoder merged 1 commit into from
Mar 22, 2025
Merged

fix: framer issue fixes #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/components/ui/flip-words.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,12 @@ export const FlipWords = ({
scale: 2,
position: "absolute"
}}
className={cn(
"z-10 inline-block relative text-left text-white dark:text-neutral-100 px-2",
className
)}
{...{
className: cn(
"z-10 inline-block relative text-left text-white dark:text-neutral-100 px-2",
className
)
}}
key={currentWord}
>
{currentWord.split(" ").map((word, wordIndex) => (
Expand All @@ -71,7 +73,7 @@ export const FlipWords = ({
delay: wordIndex * 0.3,
duration: 0.3
}}
className="inline-block whitespace-nowrap"
{...{ className: "inline-block whitespace-nowrap" }}
>
{word.split("").map((letter, letterIndex) => (
<motion.span
Expand All @@ -82,7 +84,7 @@ export const FlipWords = ({
delay: wordIndex * 0.3 + letterIndex * 0.05,
duration: 0.2
}}
className="inline-block"
{...{ className: "inline-block" }}
>
{letter}
</motion.span>
Expand Down
34 changes: 22 additions & 12 deletions src/components/ui/floating-dock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ const FloatingDockMobile = ({
{open && (
<motion.div
layoutId="nav"
className="absolute bottom-full mb-2 inset-x-0 flex flex-col gap-2"
{...{
className:
"absolute bottom-full mb-2 inset-x-0 flex flex-col gap-2"
}}
>
{items.map((item, idx) => (
<motion.div
Expand Down Expand Up @@ -99,12 +102,16 @@ const FloatingDockDesktop = ({
let mouseX = useMotionValue(Infinity);
return (
<motion.div
onMouseMove={(e) => mouseX.set(e.pageX)}
onMouseLeave={() => mouseX.set(Infinity)}
className={cn(
"mx-auto hidden md:flex h-16 gap-4 items-end rounded-2xl bg-gray-50 dark:bg-neutral-900 px-4 pb-3",
className
)}
// onMouseMove={(e) => mouseX.set(e.pageX)}
// onMouseLeave={() => mouseX.set(Infinity)}
{...{
onMouseMove: (e: MouseEvent) => mouseX.set(e.pageX),
onMouseLeave: (e: MouseEvent) => mouseX.set(Infinity),
className: cn(
"mx-auto hidden md:flex h-16 gap-4 items-end rounded-2xl bg-gray-50 dark:bg-neutral-900 px-4 pb-3",
className
)
}}
>
{items.map((item) => (
<IconContainer mouseX={mouseX} key={item.title} {...item} />
Expand Down Expand Up @@ -170,10 +177,13 @@ function IconContainer({
<Link href={href}>
<motion.div
ref={ref}
style={{ width, height }}
onMouseEnter={() => setHovered(true)}
onMouseLeave={() => setHovered(false)}
className="aspect-square rounded-full bg-gray-200 dark:bg-neutral-800 flex items-center justify-center relative"
{...{
style: { width, height },
onMouseEnter: () => setHovered(true),
onMouseLeave: () => setHovered(false),
className:
"aspect-square rounded-full bg-gray-200 dark:bg-neutral-800 flex items-center justify-center relative"
}}
>
<AnimatePresence>
{/* {hovered && (
Expand All @@ -189,7 +199,7 @@ function IconContainer({
</AnimatePresence>
<motion.div
style={{ width: widthIcon, height: heightIcon }}
className="flex items-center justify-center"
{...{ className: "flex items-center justify-center" }}
>
{icon}
</motion.div>
Expand Down
Loading