Improve Hero Scroll Performance #11

Merged
google-labs-jules[bot] merged 2 commits from perf/hero-scroll-optimization-17565878780941299000 into main 2026-01-23 10:03:35 +00:00
5 changed files with 79 additions and 57 deletions
Showing only changes of commit 7c3dd7b5cb - Show all commits

View File

@@ -66,8 +66,17 @@ describe('GradientBlinds', () => {
vi.clearAllMocks();
});
it('starts animation loop on mount', () => {
it('does not start animation loop on mount until visible', () => {
const { unmount } = render(<GradientBlinds />);
expect(rafSpy).not.toHaveBeenCalled();
// Simulate on-screen
act(() => {
if (ioCallback) {
ioCallback([{ isIntersecting: true } as IntersectionObserverEntry]);
}
});
expect(rafSpy).toHaveBeenCalled();
unmount();
expect(cancelRafSpy).toHaveBeenCalled();
@@ -76,7 +85,15 @@ describe('GradientBlinds', () => {
it('pauses animation loop when off-screen and resumes when on-screen', () => {
const { unmount } = render(<GradientBlinds />);
// Initial start
// Should not start initially
expect(rafSpy).not.toHaveBeenCalled();
// Simulate on-screen (start)
act(() => {
if (ioCallback) {
ioCallback([{ isIntersecting: true } as IntersectionObserverEntry]);
}
});
expect(rafSpy).toHaveBeenCalledTimes(1);
// Reset spies to check for subsequent calls

View File

@@ -349,8 +349,6 @@ void main() {
});
observer.observe(container);
rafRef.current = requestAnimationFrame(loop);
return () => {
if (rafRef.current) cancelAnimationFrame(rafRef.current);
canvas.removeEventListener('pointermove', onPointerMove);

View File

@@ -86,26 +86,22 @@ describe('FancyCursor', () => {
document.body.removeChild(link);
});
it('uses fallback elementFromPoint if hoveredElement is null', () => {
it('does not call elementFromPoint on mousemove', () => {
// Reset elementFromPoint mock
const mockElementFromPoint = vi.fn();
// @ts-ignore
document.elementFromPoint = mockElementFromPoint;
// We need to remount to reset internal state if any.
// However, 'hoveredElement' variable was defined INSIDE the component in my edit.
// Let's double check that.
render(<FancyCursor />);
// Trigger mousemove WITHOUT prior mouseover.
// This should trigger the fallback.
// Trigger mousemove
fireEvent.mouseMove(window, { clientX: 10, clientY: 10 });
act(() => {
vi.runAllTimers();
});
expect(mockElementFromPoint).toHaveBeenCalledWith(10, 10);
// Should NOT be called in the optimized version
expect(mockElementFromPoint).not.toHaveBeenCalled();
});
});

View File

@@ -19,29 +19,8 @@ export const FancyCursor = memo(() => {
if (!cursor) return;
let animationFrameId: number;
let hoveredElement: Element | null = null;
const handleMouseOver = (e: MouseEvent) => {
hoveredElement = e.target as Element;
};
// The mouse move handler is throttled with requestAnimationFrame to ensure
// the animation is smooth and doesn't cause performance issues.
const handleMouseMove = (e: MouseEvent) => {
cancelAnimationFrame(animationFrameId);
animationFrameId = requestAnimationFrame(() => {
// The offset issue was caused by positioning the cursor's top-left corner
// at the mouse coordinates. To fix this, `translate(-50%, -50%)` is added.
// This shifts the cursor element by half its own width and height,
// which effectively centers it on the pointer without affecting the visuals.
cursor.style.transform = `translate3d(${e.clientX}px, ${e.clientY}px, 0) translate(-50%, -50%)`;
// Use the cached hovered element if available, otherwise fallback to elementFromPoint
// This fallback is mostly for the initial state before any mouseover events
if (!hoveredElement) {
hoveredElement = document.elementFromPoint(e.clientX, e.clientY);
}
const el = hoveredElement;
const updateCursorState = (el: Element | null) => {
const classList = cursor.classList;
// Coercing to boolean with `!!` is a micro-optimization.
@@ -54,6 +33,22 @@ export const FancyCursor = memo(() => {
classList.toggle('resize-hover', isResize);
classList.toggle('text-hover', isText && !isResize);
classList.toggle('link-hover', isLink && !isText && !isResize);
};
const handleMouseOver = (e: MouseEvent) => {
updateCursorState(e.target as Element);
};
// The mouse move handler is throttled with requestAnimationFrame to ensure
// the animation is smooth and doesn't cause performance issues.
const handleMouseMove = (e: MouseEvent) => {
cancelAnimationFrame(animationFrameId);
animationFrameId = requestAnimationFrame(() => {
// The offset issue was caused by positioning the cursor's top-left corner
// at the mouse coordinates. To fix this, `translate(-50%, -50%)` is added.
// This shifts the cursor element by half its own width and height,
// which effectively centers it on the pointer without affecting the visuals.
cursor.style.transform = `translate3d(${e.clientX}px, ${e.clientY}px, 0) translate(-50%, -50%)`;
});
};

View File

@@ -1,4 +1,4 @@
import { useState, useEffect, useMemo } from 'react';
import { useState, useEffect, useMemo, useRef } from 'react';
interface UseTypingEffectOptions {
words: string[];
@@ -23,44 +23,60 @@ export function useTypingEffect({
// eslint-disable-next-line react-hooks/exhaustive-deps
const stableWords = useMemo(() => words, [JSON.stringify(words)]);
// Ref to hold the latest state for the timer loop
const stateRef = useRef({ currentText, isDeleting, isPaused });
useEffect(() => {
stateRef.current = { currentText, isDeleting, isPaused };
});
// Effect 1: Handle word switching when deleted
useEffect(() => {
if (isDeleting && currentText === '' && !isPaused) {
setIsDeleting(false);
setCurrentWordIndex((prev) => (prev + 1) % stableWords.length);
}
}, [currentText, isDeleting, isPaused, stableWords]);
// Effect 2: Timer Loop
useEffect(() => {
let timer: ReturnType<typeof setTimeout>;
const currentWord = stableWords[currentWordIndex];
const isWordDeleted = isDeleting && currentText === '';
// If word is fully deleted, move to next word immediately (no timer)
if (!isPaused && isWordDeleted) {
setIsDeleting(false);
setCurrentWordIndex((prev) => (prev + 1) % stableWords.length);
return;
}
const tick = () => {
const { currentText, isDeleting, isPaused } = stateRef.current;
// Determine speed based on state
const speed = isPaused ? pauseDuration : (isDeleting ? deletingSpeed : typingSpeed);
timer = setTimeout(() => {
if (isPaused) {
setIsPaused(false);
setIsDeleting(true);
} else {
// Typing logic
return;
}
if (isDeleting) {
if (currentText === '') {
// Handled by the other effect
return;
}
setCurrentText((prev) => prev.substring(0, prev.length - 1));
timer = setTimeout(tick, deletingSpeed);
} else {
const nextText = currentWord.substring(0, currentText.length + 1);
setCurrentText(nextText);
if (nextText === currentWord) {
setIsPaused(true);
} else {
timer = setTimeout(tick, typingSpeed);
}
}
}
}, speed);
};
// Determine initial speed
const speed = isPaused ? pauseDuration : (isDeleting ? deletingSpeed : typingSpeed);
timer = setTimeout(tick, speed);
return () => clearTimeout(timer);
}, [
currentText,
isDeleting,
isPaused,
currentWordIndex,