Skip to content

Refactor AnimatedContent: custom scroller support, safer cleanup & exit animations #723

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+273 −106
Open

Refactor AnimatedContent: custom scroller support, safer cleanup & exit animations #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a080f9
Scroll targeting, fix cleanup & add exit animations
freakdaniel Nov 21, 2025
551dae2
Sync new features to all variants (JS + CSS/TW, TS + CSS/TW). Added `…
freakdaniel Nov 21, 2025
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
90 changes: 63 additions & 27 deletions src/content/Animations/AnimatedContent/AnimatedContent.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ gsap.registerPlugin(ScrollTrigger);

const AnimatedContent = ({
children,
container,
distance = 100,
direction = 'vertical',
reverse = false,
Expand All @@ -16,59 +17,94 @@ const AnimatedContent = ({
scale = 1,
threshold = 0.1,
delay = 0,
onComplete
disappearAfter = 0,
disappearDuration = 0.5,
disappearEase = 'power3.in',
onComplete,
onDisappearanceComplete,
className = '',
...props
}) => {
const ref = useRef(null);

useEffect(() => {
const el = ref.current;
if (!el) return;

let scrollerTarget = container || document.getElementById('snap-main-container') || null;

if (typeof scrollerTarget === 'string') {
scrollerTarget = document.querySelector(scrollerTarget);
}

const axis = direction === 'horizontal' ? 'x' : 'y';
const offset = reverse ? -distance : distance;
const startPct = (1 - threshold) * 100;

gsap.set(el, {
[axis]: offset,
scale,
opacity: animateOpacity ? initialOpacity : 1
opacity: animateOpacity ? initialOpacity : 1,
visibility: 'visible'
});

const tl = gsap.timeline({
paused: true,
delay,
onComplete: () => {
if (onComplete) onComplete();
if (disappearAfter > 0) {
gsap.to(el, {
[axis]: reverse ? distance : -distance,
scale: 0.8,
opacity: animateOpacity ? initialOpacity : 0,
delay: disappearAfter,
duration: disappearDuration,
ease: disappearEase,
onComplete: () => onDisappearanceComplete?.()
});
}
}
});

gsap.to(el, {
tl.to(el, {
[axis]: 0,
scale: 1,
opacity: 1,
duration,
ease,
delay,
onComplete,
scrollTrigger: {
trigger: el,
start: `top ${startPct}%`,
toggleActions: 'play none none none',
once: true
}
ease
});

const st = ScrollTrigger.create({
trigger: el,
scroller: scrollerTarget,
start: `top ${startPct}%`,
once: true,
onEnter: () => tl.play()
});

return () => {
ScrollTrigger.getAll().forEach(t => t.kill());
gsap.killTweensOf(el);
st.kill();
tl.kill();
};
}, [
distance,
direction,
reverse,
duration,
ease,
initialOpacity,
animateOpacity,
scale,
threshold,
delay,
onComplete
container,
distance, direction, reverse, duration, ease,
initialOpacity, animateOpacity, scale, threshold,
delay, disappearAfter, disappearDuration,
disappearEase, onComplete, onDisappearanceComplete
]);

return <div ref={ref}>{children}</div>;
return (
<div
ref={ref}
className={className}
style={{ visibility: 'hidden' }}
{...props}
>
{children}
</div>
);
};

export default AnimatedContent;
export default AnimatedContent;
89 changes: 62 additions & 27 deletions src/tailwind/Animations/AnimatedContent/AnimatedContent.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ gsap.registerPlugin(ScrollTrigger);

const AnimatedContent = ({
children,
container,
distance = 100,
direction = 'vertical',
reverse = false,
Expand All @@ -16,59 +17,93 @@ const AnimatedContent = ({
scale = 1,
threshold = 0.1,
delay = 0,
onComplete
disappearAfter = 0,
disappearDuration = 0.5,
disappearEase = 'power3.in',
onComplete,
onDisappearanceComplete,
className = '',
...props
}) => {
const ref = useRef(null);

useEffect(() => {
const el = ref.current;
if (!el) return;

let scrollerTarget = container || document.getElementById('snap-main-container') || null;

if (typeof scrollerTarget === 'string') {
scrollerTarget = document.querySelector(scrollerTarget);
}

const axis = direction === 'horizontal' ? 'x' : 'y';
const offset = reverse ? -distance : distance;
const startPct = (1 - threshold) * 100;

gsap.set(el, {
[axis]: offset,
scale,
opacity: animateOpacity ? initialOpacity : 1
opacity: animateOpacity ? initialOpacity : 1,
visibility: 'visible'
});

const tl = gsap.timeline({
paused: true,
delay,
onComplete: () => {
if (onComplete) onComplete();
if (disappearAfter > 0) {
gsap.to(el, {
[axis]: reverse ? distance : -distance,
scale: 0.8,
opacity: animateOpacity ? initialOpacity : 0,
delay: disappearAfter,
duration: disappearDuration,
ease: disappearEase,
onComplete: () => onDisappearanceComplete?.()
});
}
}
});

gsap.to(el, {
tl.to(el, {
[axis]: 0,
scale: 1,
opacity: 1,
duration,
ease,
delay,
onComplete,
scrollTrigger: {
trigger: el,
start: `top ${startPct}%`,
toggleActions: 'play none none none',
once: true
}
ease
});

const st = ScrollTrigger.create({
trigger: el,
scroller: scrollerTarget,
start: `top ${startPct}%`,
once: true,
onEnter: () => tl.play()
});

return () => {
ScrollTrigger.getAll().forEach(t => t.kill());
gsap.killTweensOf(el);
st.kill();
tl.kill();
};
}, [
distance,
direction,
reverse,
duration,
ease,
initialOpacity,
animateOpacity,
scale,
threshold,
delay,
onComplete
container,
distance, direction, reverse, duration, ease,
initialOpacity, animateOpacity, scale, threshold,
delay, disappearAfter, disappearDuration,
disappearEase, onComplete, onDisappearanceComplete
]);

return <div ref={ref}>{children}</div>;
return (
<div
ref={ref}
className={`invisible ${className}`}
{...props}
>
{children}
</div>
);
};

export default AnimatedContent;
export default AnimatedContent;
Loading